OSDN Git Service

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

Change-Id: Ia9e731b70918e47abd0de2b243ac59056ab90230


Trivial merge
build
About OSDN
Find Software
Develop Software
Help