From: Allen Hair Date: Tue, 28 Jun 2016 18:25:39 +0000 (+0000) Subject: Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=71a4f80ee95252478666375b2d916a59b0468358;p=android-x86%2Fbuild.git Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b1e am: 49fd8a24f3 -s ours Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6 --- 71a4f80ee95252478666375b2d916a59b0468358