Skip to content
Commit a0297e34 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)" am: b2ac85e7 am: edefe593
am: 5d43c167  -s ours

Change-Id: I077e5c803f06c2ae994514850ee64c18a57a81eb
parents 567564a1 5d43c167
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment