Commit 46d52f99 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

Change-Id: I6583467811d29574b0336fc7bb58d1678cc0f845
parents 3aedf904 1d15d94a
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