tree c357e1f248854de4ead2227e1c92bb5f38234d13
parent 012416fdbb279f291b43e9d6bf565750752e6a41
parent 9f9f901200680b2dee5839d68bee4240b7aed21f
author Scott Main <smain@google.com> 1371594548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371594548 -0700

am 9f9f9012: am c485361e: am 99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c

* commit '9f9f901200680b2dee5839d68bee4240b7aed21f':
  update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c