OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 216b1ed f2304ce)
resolve merge conflicts of f2304ce to nyc-mr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)
committerIan Pedowitz <ijpedowitz@google.com>
Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b

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