am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would...
am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '10526a0b':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions