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

Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

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