Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b2303e3 authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

resolved conflicts for merge of 4330b146 to honeycomb-merge 

Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
parents c97297a9 960f8a68

NOTICE

+10 −1
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ the Apache2 License. 


Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, 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 Additional Codecs code.                           ==

   =========================================================================



Additional Codecs

These files are Copyright 2003-2010 VisualOn, but released under

the Apache2 License.



   =========================================================================
@@ -83,7 +93,6 @@ 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/