From: Allen Hair <allenhair@google.com>
Date: Tue, 28 Jun 2016 18:25:43 +0000 (+0000)
Subject: Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f016493ca;p=android-x86%2Fbuild.git

Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e  -s ours

Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689
---

1f016493cae26b1beb419b44568281cc1c070f33