commit a5c20fd4b0ee41a02ecb2f9ea5dbebffaef1b948
author Dmitry Shmidt <dimitrysh@google.com> Fri Nov 16 11:37:36 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 11:37:36 2012 -0800
tree f75941001e49ecffe4844d8b8a056d067ea55c61
parent fad4571e08e3026c076a588d1ed71a7bfeaee638
parent 0a81ae7dea91cc64040c635d7c4f7355bd64483b

am 0a81ae7d: am 88ad9eea: am 29dda139: tuna: kernel prebuilt

* commit '0a81ae7dea91cc64040c635d7c4f7355bd64483b':
  tuna: kernel prebuilt

media_codecs.xml

diff --git a/media_codecs.xml b/media_codecs.xml
index 4ac9123..87d02de 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -92,6 +92,7 @@
         <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
         <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
         <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
+        <MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm" />
 
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />