tree 614b39a755c336b9b7cd29d47435202f02cab492
parent 26c2205a15d67e5388ca73d54994e38294f4a135
parent 3fe5b75a59f7cbff55041d48b13967698a5693ea
author Paul Duffin <paulduffin@google.com> 1488535280 +0000
committer android-build-merger <android-build-merger@google.com> 1488535280 +0000

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: 3fe5b75a59

Change-Id: Ie1b6e33f4e75114f65a79aeb38c34138bd62500e