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

am: 28f867d780  -s ours

Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
main
Paul Duffin 2017-05-11 11:53:32 +00:00 committed by android-build-merger
commit fc91fc0582

Diff Content Not Available