OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ab1c38 a8b5f7e)
am a8b5f7e7: (-s ours) resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)
* commit 'a8b5f7e73703c3d57086f7aded1749a0801dd997':


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