OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5c29e3 7a50757)
resolve merge conflicts of 7a50757 to nyc-mr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)
committerIan Pedowitz <ijpedowitz@google.com>
Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57


Trivial merge
build
About OSDN
Find Software
Develop Software
Help