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
tree: e755c472a80ff39ffac15d74460855e9f5dc725e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/