OSDN Git Service

am 9f9f9012: am c485361e: am 99700bfe: update supported media formats. as per I6372ba...
authorScott Main <smain@google.com>
Tue, 18 Jun 2013 22:29:08 +0000 (15:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Jun 2013 22:29:08 +0000 (15:29 -0700)
commit602c0d8b499aa9593e5713cb92f15c45cc9f9a54
treec357e1f248854de4ead2227e1c92bb5f38234d13
parent012416fdbb279f291b43e9d6bf565750752e6a41
parent9f9f901200680b2dee5839d68bee4240b7aed21f
am 9f9f9012: am c485361e: am 99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c

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