OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 959df31 7daa748)
am b840ec70: am 8bad28ef: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select...
authorRobert Shih <robertshih@google.com>
Wed, 10 Sep 2014 07:22:48 +0000 (07:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 07:22:48 +0000 (07:22 +0000)
* commit 'b840ec70c54672c8435f67f93b6fc03156208098':
  MediaPlayer/SubtitleController:fix add/select timed text on start


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help