ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 

Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b
This commit is contained in:
Eric Laurent 2011-01-17 14:17:12 -08:00
parent 5afecb600f 7d95b378e0
commit 1a2c7098c8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NOTICE
View File

@ -82,6 +82,18 @@ Additional Codecs
These files are Copyright 2003-2010 VisualOn, but released under These files are Copyright 2003-2010 VisualOn, but released under
the Apache2 License. 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 Apache License
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/