OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3aa27d5 bd2d5da)
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sat, 13 May 2017 01:10:44 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 May 2017 01:10:44 +0000 (01:10 +0000)
am: bd2d5da516

Change-Id: I236d539a49f2c8ec49afe7b6c5e58e99bd602982


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