diff options
| author | Dan Morrill <morrildl@google.com> | 2011-01-13 11:48:42 -0800 |
|---|---|---|
| committer | Dan Morrill <morrildl@google.com> | 2011-01-13 11:48:42 -0800 |
| commit | b34b504affaef9a372cae9a6dc13a37347073bdc (patch) | |
| tree | 9dbbcc94ae62c4845ab7d3b70851442dd74ed678 /NOTICE | |
| parent | 1c1ccdfc21a2055c77541e6168a3096e25c4e596 (diff) | |
| parent | 90ed94cf7101335da5425ef33f64c266e2d000a1 (diff) | |
| download | android_frameworks_native-b34b504affaef9a372cae9a6dc13a37347073bdc.tar.gz android_frameworks_native-b34b504affaef9a372cae9a6dc13a37347073bdc.tar.bz2 android_frameworks_native-b34b504affaef9a372cae9a6dc13a37347073bdc.zip | |
Fix merge conflict for 'c506ab89'
Conflicts:
NOTICE
Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -72,6 +72,15 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied; not even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for Additional Codecs code. == + ========================================================================= + +Additional Codecs +These files are Copyright 2003-2010 VisualOn, but released under +the Apache2 License. Apache License Version 2.0, January 2004 |