OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01eed5f 6c671f1)
am 212bce2e: am 8a41acbb: Merge "MediaPlayer: added getSelectedTrack"
authorRobert Shih <robertshih@google.com>
Mon, 14 Jul 2014 20:20:15 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:20:15 +0000 (20:20 +0000)
* commit '212bce2e4744b314a2add0d5ba4f3bbac7f46b13':


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