tree 77fffd7cf990b1c75e4182d7438bac1d09419e34
parent c8e643a86345ef7e2807946107062c9d8635455d
parent 2c2ed7bef931f43dc0701ab723beb0cbed2cb630
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