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)
commit49fd8a24f3118fca979535ff7c71bcb8393d04c8
treef45749e11b7ea32fed175bdb882b815e2a4ef562
parentbb5454b6db5770f0b0275424148b2d7d3c52a56d
parent1f44c26b1eb46503de995735d093e00d8ff9d712
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216