OSDN Git Service

am 6550f08a: Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare...
authorRobert Shih <robertshih@google.com>
Tue, 29 Jul 2014 21:10:55 +0000 (21:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Jul 2014 21:10:55 +0000 (21:10 +0000)
commit8dae90ccd21f781adf1cc75dbfbcf4ddd8603cc2
tree184eb9b509557c427488f022a10bda43dfd37a31
parent0d80c639821efbef1dd7ada21964c67d1daa6bb0
parent05ad96e9a33e4e3d5568cfc3443fcb4dd7067433
am 6550f08a: Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev

* commit '6550f08a0bf0c0c3e8317b285e844d928e9ae7e2':
  MediaPlayer: scanInternalSubtitleTracks in synchronous prepare