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:45:17 +0000 (17:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)

Trivial merge