OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c028287 49fd8a2)
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc...
authorAllen Hair <allenhair@google.com>
Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)
am: 49fd8a24f3  -s ours

Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6


Trivial merge
build
About OSDN
Find Software
Develop Software
Help