OSDN Git Service

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

Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689


Trivial merge
build
About OSDN
Find Software
Develop Software
Help