OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20d8811 9416c50)
am 9416c501: am e14a2f33: (-s ours) am 7b996853: Merge "MediaPlayer subtitle controll...
authorJean-Michel Trivi <jmtrivi@google.com>
Thu, 27 Aug 2015 18:27:58 +0000 (18:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:27:58 +0000 (18:27 +0000)
* commit '9416c5012c721197f74f072a3d34cb1dd159b937':


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