diff options
| author | Eric Laurent <elaurent@google.com> | 2011-01-17 13:29:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-17 13:29:45 -0800 |
| commit | adee6b3559b0260361305e57662ebcaed93ddeaa (patch) | |
| tree | 7590936079dfdd17241974efa3bd82501fa6bb98 /NOTICE | |
| parent | a1487347f5ba24648303bf8c9e455ca2ef0de7ea (diff) | |
| parent | ed2d6b78f6b57c233ca6d3dc3f5803a2a3971c4a (diff) | |
| download | frameworks_base-adee6b3559b0260361305e57662ebcaed93ddeaa.zip frameworks_base-adee6b3559b0260361305e57662ebcaed93ddeaa.tar.gz frameworks_base-adee6b3559b0260361305e57662ebcaed93ddeaa.tar.bz2 | |
Merge "Fix omission in NOTICE file." into honeycomb
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -72,6 +72,17 @@ 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 the Audio Effects code. == + ========================================================================= + +Audio Effects +These files are Copyright (C) 2004-2010 NXP Software and +Copyright (C) 2010 The Android Open Source Project, but released under +the Apache2 License. + Apache License Version 2.0, January 2004 |