am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
tree: 5acd8295576f58d0445acb76f609a9944ef7ccb9
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/