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

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

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
---

49fd8a24f3118fca979535ff7c71bcb8393d04c8