OSDN Git Service

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

Change-Id: I4ab7f8ce0b6c3a70e0ee442b96295e832982d6dc


Trivial merge
build
About OSDN
Find Software
Develop Software
Help