tree b384ee75405465b41a55c0fb82ddf0b3f16b7dd1
parent 36e39984cbc9f594feeaf5caad83a171d41864b8
parent b3cc6a47f2a2b301ab668ed759beace17d7009f8
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