OSDN Git Service

Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
authorAllen Hair <allenhair@google.com>
Tue, 28 Jun 2016 17:53:00 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 17:53:00 +0000 (17:53 +0000)
am: 1f44c26b1e

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216


Trivial merge