Commit 36479e58 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Prepare for removal of junit and android.test classes from Android API... 

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp
am: bd7658ac  -s ours

Change-Id: I55350f5b182e90edb24fc84bdbfc53234cade150
parents fbbc190a bd7658ac
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