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 | 1a2c7098c81e04b8c6e37b0937fc59ae29f33055 (patch) | |
| tree | 96adbfbb698e7e86289f8e7e8f724ad2340c5222 /NOTICE | |
| parent | 5afecb600f4b4ffdc5c6b5e2d2a6ea31a7874aad (diff) | |
| parent | 7d95b378e07c213d0536378e546ff709cef46415 (diff) | |
| download | frameworks_native-1a2c7098c81e04b8c6e37b0937fc59ae29f33055.zip frameworks_native-1a2c7098c81e04b8c6e37b0937fc59ae29f33055.tar.gz frameworks_native-1a2c7098c81e04b8c6e37b0937fc59ae29f33055.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/ |