OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1a23c3 da8f85a)
am da8f85a6: am a8b5f7e7: (-s ours) resolved conflicts for merge of b699685e to mnc...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 14:42:57 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:42:57 +0000 (14:42 +0000)
* commit 'da8f85a62cb5f341e209cc33ab4f499441963205':


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