diff options
| author | Eric Laurent <elaurent@google.com> | 2011-01-17 14:17:12 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-01-17 14:17:12 -0800 |
| commit | 2b30e051b625df4b08ee520cd86c23919a9622f1 (patch) | |
| tree | b9e50fb24e58cbbfe98c0667f25bb0c30d6cc49a /NOTICE | |
| parent | dc494e1e48b499ee1e56210fc82d3c489a6f5922 (diff) | |
| parent | adee6b3559b0260361305e57662ebcaed93ddeaa (diff) | |
| download | frameworks_base-2b30e051b625df4b08ee520cd86c23919a9622f1.zip frameworks_base-2b30e051b625df4b08ee520cd86c23919a9622f1.tar.gz frameworks_base-2b30e051b625df4b08ee520cd86c23919a9622f1.tar.bz2 | |
resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp
Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -82,6 +82,18 @@ Additional Codecs These files are Copyright 2003-2010 VisualOn, but released under the Apache2 License. + ========================================================================= + == 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 http://www.apache.org/licenses/ |