OSDN Git Service

Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc...
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: 1f016493ca

Change-Id: I93d32080e46da6ea3494406e04d2cb2e292fcc20


Trivial merge