tree 652a5ff4d0f6521d9299e0520478b44a645b2955
parent 5cecf1643c4b57d1bc1033619ea308f1cce1eb17
parent 4406105ad1f22d7ce2d43785fa621ad8c7e93eb7
author Paul Duffin <paulduffin@google.com> 1494427070 +0000
committer android-build-merger <android-build-merger@google.com> 1494427070 +0000

Revert "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 031b913e17 am: 3173cc34c7 am: 9ea489ac77
am: 4406105ad1

Change-Id: Ia57d62e20c7dc192c4a583021e6afc9a53cb1e90