OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eade3f 012144f)
resolve merge conflicts of 012144f to nyc-dev
authorJeff Vander Stoep <jeffv@google.com>
Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)
committerJeff Vander Stoep <jeffv@google.com>
Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a


Trivial merge
build
About OSDN
Find Software
Develop Software
Help