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)
commit0168788d0ea8a34cdea5edc4de8993471c3ba47a
tree7c4ab28aec7ece3284a377bc321b5d0f707a7acb
parent71a4f80ee95252478666375b2d916a59b0468358
parent1f016493cae26b1beb419b44568281cc1c070f33
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b1e  -s ours
am: 1f016493ca

Change-Id: I93d32080e46da6ea3494406e04d2cb2e292fcc20