Commit 0780edc2 authored by Richard Uhler's avatar Richard Uhler Committed by android-build-merger
Browse files

Merge "Don't build ahat tests with EMMA_INSTRUMENT." am: 01682113 am: 1d15d94a 

am: 46d52f99

Change-Id: I7542e7daf41475b22a705e7f4e8e4c720b02660b
parents 5b08517d 46d52f99
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment