OSDN Git Service

am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise...
authorAndreas Huber <andih@google.com>
Thu, 1 Dec 2011 18:22:19 +0000 (10:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Dec 2011 18:22:19 +0000 (10:22 -0800)
* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

1  2 
media/libstagefright/AVIExtractor.cpp

Simple merge