OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d78fa32 1d2bfb2)
resolve merge conflicts of 7a50757 to nyc-mr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Mon, 6 Jun 2016 17:32:32 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 17:32:32 +0000 (17:32 +0000)
am: 1d2bfb274e

* commit '1d2bfb274e4e62875809aeed632d865e85974b4c':
  NYC is 7.0

Change-Id: I2565e7ab290eea462a1e0b32599378a95b7c4f1f


Trivial merge
build
About OSDN
Find Software
Develop Software
Help