OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2697421 505f1ea)
resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp
authorShinichiro Hamaji <hamaji@google.com>
Fri, 13 May 2016 05:33:09 +0000 (14:33 +0900)
committerShinichiro Hamaji <hamaji@google.com>
Fri, 13 May 2016 05:33:34 +0000 (14:33 +0900)
Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e

1  2 
core/definitions.mk patch | diff1 | diff2 | blob | history

diff --cc core/definitions.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help