OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f69cef2 dc87b10)
am dc87b105: am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat...
authorRubin Xu <rubinxu@google.com>
Thu, 27 Aug 2015 20:16:08 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:16:08 +0000 (20:16 +0000)
* commit 'dc87b1052370a4c1966dbc70856869359df37e03':


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help