OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd312c9 4a67377)
resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb
authorTao Bao <tbao@google.com>
Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)
am: 4a673770cb

Change-Id: Ibb07dea374703ad2098f1c3744fde0b21a54ed3d


Trivial merge
build
About OSDN
Find Software
Develop Software
Help