OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9060136 a36f36d)
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am...
authorZach Jang <zachjang@google.com>
Wed, 22 Jun 2016 01:49:56 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:49:56 +0000 (01:49 +0000)
am: a36f36dcc0

Change-Id: If03ecbb95d14127d9534aecd20da984b2fd65d1c

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

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