OSDN Git Service

am 72862157: am 4ddd6a88: am 40bdcb7c: Merge "MediaPlayer: persistent track indices...
authorRobert Shih <robertshih@google.com>
Mon, 18 May 2015 16:32:07 +0000 (16:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 May 2015 16:32:07 +0000 (16:32 +0000)
* commit '7286215792e09352665c58630186f5b8dd1e4fa6':
  MediaPlayer: persistent track indices


Trivial merge