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)
commit17078d8a83becd5bfb49a39f1415882b78d07a49
treee755c472a80ff39ffac15d74460855e9f5dc725e
parent2c0dd961d42ad75529a557240ed570f97b237d2f
parent1d26d11ebdc2cd53691b868e7dde844a708896a1
am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
media/libstagefright/AVIExtractor.cpp