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:25:39 +0000 (18:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)
commit71a4f80ee95252478666375b2d916a59b0468358
tree7c4ab28aec7ece3284a377bc321b5d0f707a7acb
parentc028287fcd7a73e4681fbea71c5404d75596ee7b
parent49fd8a24f3118fca979535ff7c71bcb8393d04c8
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b1e
am: 49fd8a24f3  -s ours

Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6