OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 784a663 f46b7b2)
resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8
authorJeff Vander Stoep <jeffv@google.com>
Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)
am: f46b7b2d77

Change-Id: I047f4bbcbe7c9edbbb3d849d7437a9c69a771580


Trivial merge
build
About OSDN
Find Software
Develop Software
Help