tree 5acd8295576f58d0445acb76f609a9944ef7ccb9
parent 8fe26ff7c76fb0c80c41c603b384d63814da97f7
parent 97e0fcc0cb69692a6c518e2bfaf9892a164e7f58
author James Dong <jdong@google.com> 1285262250 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285262250 -0700

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