OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 091fa1e 6fb6aa5)
resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8 am: b73e902c7d
authorDaniel Micay <danielmicay@gmail.com>
Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)
am: 6fb6aa51a4

Change-Id: Idf628306cde9e0149db11c732f138289f180eea9


Trivial merge
build
About OSDN
Find Software
Develop Software
Help