tree c52f1b060310294ecf7549bc4b6618a3c17d1624
parent 999536c0c72b266924d7f64937a5e53c511dfb3b
parent 8937acfca0eff28d16919493ecc1b700a79885d5
author Paul Duffin <paulduffin@google.com> 1488552242 +0000
committer android-build-merger <android-build-merger@google.com> 1488552242 +0000

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

Change-Id: I91bcd37ef04a8f8e7258fea72fcb516f8c0be386