OSDN Git Service

am 55e6ad78: Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata...
authorRobert Shih <robertshih@google.com>
Wed, 13 May 2015 23:45:02 +0000 (23:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 May 2015 23:45:02 +0000 (23:45 +0000)
* commit '55e6ad78a0a30f917b6f0c135fdf328ebafc68fb':
  MediaPlayer/TimedMetaData: API updates related to timed metadata


Trivial merge