OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b92731 4a029de)
resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
authorTao Bao <tbao@google.com>
Wed, 26 Oct 2016 23:11:40 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Oct 2016 23:11:40 +0000 (23:11 +0000)
am: 4a029de94a

Change-Id: Ia016bf93c4b4ae58dd2d46994daaec003b6701ff


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