OSDN Git Service

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

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45


Trivial merge
build
About OSDN
Find Software
Develop Software
Help