OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba4c8d9 7df3890)
resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 06:18:21 +0000 (06:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 06:18:21 +0000 (06:18 +0000)
am: 7df3890039

Change-Id: I4f3dd7b66e0e5807d89cd19542c39dd81ae6ddf3


Trivial merge
build
About OSDN
Find Software
Develop Software
Help