OSDN Git Service

am bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings...
authorAndreas Huber <andih@google.com>
Wed, 21 Sep 2011 20:57:54 +0000 (13:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Sep 2011 20:57:54 +0000 (13:57 -0700)
* commit 'bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23':
  Support some .avi files containing H.264 video, log warnings if audio/video unsupported


Trivial merge