OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f186ed ad06e79)
am ad06e79d: (-s ours) resolved conflicts for merge of 743e4b08 to mnc-dev-plus-aosp
authorSimon Wilson <simonwilson@google.com>
Thu, 27 Aug 2015 11:17:14 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:14 +0000 (11:17 +0000)
* commit 'ad06e79de060959cf5bea8a3d09e86cb097f67ed':


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help