tree 60a86919e626e09690310f1a42282c82c53f52ac
parent ec92962c0690a22116b79cda761885f26d0d4392
parent 8adebc7d05939fa01c27e4537f8e50615f741d2f
author Andreas Huber <andih@google.com> 1322763609 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322763609 -0800

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