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

Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev 

am: 0fca5f75

* commit '0fca5f75':
  Disable stripped-dex test for no-dex2oat.
  Disable stripped-dex test on target.

Change-Id: I59bf0c294f60cbd25922b57a6bc36af62b661762
parents c66d6a68 0fca5f75
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