commit 017917fe58800fbbd40b48ec24d3a04beca2e0b8
author Andreas Huber <andih@google.com> Wed Jan 19 08:11:39 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 19 08:11:39 2011 -0800
tree 25b4ca3a09571a9817e898d36ef17f6ba767e648
parent b81e631c22fc34a2fdbc4b9094c3aea3af84451e
parent 0d7c11e143ca32f6eb21a752ee95bafce95fa2c8

Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread

NOTICE

diff --git a/NOTICE b/NOTICE
index 5560999..c45f010 100644
--- a/NOTICE
+++ b/NOTICE
@@ -63,6 +63,17 @@
 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/