commit 12ee69be3cbd788f4d2b8252cddfd1fdac552e4e
author Jean-Baptiste Queru <jbq@google.com> Fri Feb 15 20:15:10 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 15 20:15:10 2013 -0800
tree 7ec89452195410d49ccb01b323237d428c86694e
parent a3b3df4ff840ca97a16996f0c596dcf4b5679c61
parent 3a394fe6c46433fb9249c6dd358f77bba9e09d49

am 3a394fe6: Reformat licences to a uniform 77-column format

* commit '3a394fe6c46433fb9249c6dd358f77bba9e09d49':
  Reformat licences to a uniform 77-column format

media_codecs.xml

diff --git a/media_codecs.xml b/media_codecs.xml
index 42ea4e9..4507a2d 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -96,5 +96,6 @@
         <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
         <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
         <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
+        <MediaCodec name="OMX.google.vpx.encoder" type="video/x-vnd.on2.vp8" />
     </Encoders>
 </MediaCodecs>