tree 614b39a755c336b9b7cd29d47435202f02cab492
parent f7f0309e3904c717ddb17f5aa75e14328b586480
parent 94f59b74cc4e8921aa4ebba29583ddc6452e864b
author Paul Duffin <paulduffin@google.com> 1488535429 +0000
committer android-build-merger <android-build-merger@google.com> 1488535429 +0000

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

Change-Id: Ib2be054393b06bb5a4b99818da3d3891d761e7dc