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

Commit 126a6eab authored by Dan Morrill's avatar Dan Morrill Committed by Android Git Automerger
Browse files

am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo 

Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp

* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
  Adding PacketVideo attribution in NOTICE.
parents 649f6f64 2e55d964

NOTICE

+10 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,16 @@ The Apache Software Foundation (http://www.apache.org/). 
   =========================================================================

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





These files are Copyright 2007 Nuance Communications, but released under

These files are Copyright 2007 Nuance Communications, 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 Media Codecs code.                            ==

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



Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, but released under

the Apache2 License.

the Apache2 License.





                               Apache License

                               Apache License