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