resolved conflicts for merge of 4330b146 to honeycomb-merge
Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
diff --git a/NOTICE b/NOTICE
index d857ba3..1c93e9f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -56,6 +56,16 @@
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
+ == in this case for Additional Codecs code. ==
+ =========================================================================
+
+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 TagSoup code. ==
=========================================================================
@@ -83,7 +93,6 @@
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/