tree 15ed27016b8367230738ba9582ded6e0dcc74472
parent f39b2cfadba27c0fd18eaf41127dc9fd59e1a2ed
parent 30c7e132171edf41a787d6e29d169ac467f6f1ae
author James Dong <jdong@google.com> 1285262677 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285262677 -0700

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