tree ab6c256b8afcf215f7a94c2696877e3cd3c64ded
parent edf0ba6e1b6de8f43880267862e43ee461901c25
parent b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2
author Scott Main <smain@google.com> 1348077623 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348077623 -0700

am b79d8ecc: udpate media formats for JB

* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB