tree 1127a54a9a7c31cdcd6d7861e581ddbe6d51c493
parent 7ee2f7785f3f77a4d4f589fe6a488662c9ad7913
parent bb2985aa0e3435a4a945233eebc9ea36769209d2
author Andreas Huber <andih@google.com> 1354849193 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354849193 -0800

am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev

* commit 'bb2985aa0e3435a4a945233eebc9ea36769209d2':
  Make it clear that non-optional MediaFormat keys are required