OSDN Git Service

Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
authorRobert Shih <robertshih@google.com>
Tue, 29 Jul 2014 21:08:21 +0000 (21:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 28 Jul 2014 22:45:16 +0000 (22:45 +0000)
commit05ad96e9a33e4e3d5568cfc3443fcb4dd7067433
tree265b397aedf8d0caa42fcf526c4369d68615c1cf
parentc91e82856c8556f859c1e0f1beb2bf3ecee4eca6
parentc42a96dba4beaf87875e71b8d8b77ce7154c5cdb
Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
media/java/android/media/MediaPlayer.java