OSDN Git Service

am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video...
authorAndreas Huber <andih@google.com>
Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)
commit1d26d11ebdc2cd53691b868e7dde844a708896a1
treefba9ea601042188ab396e20cb69e98ffe6ff6290
parent15031854d15ffcc5c955290f61aa59aa09e1fde9
parent4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f
am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions