tree ecf437ed42cfc4e63dea3b7e695c7d467023e4d2
parent d487a0e424bf8d67dc0b0e2111f0a38b90ac38d9
parent c3feb4707cdc610cbd2c320757dec6b6afe4f252
author Paul Duffin <paulduffin@google.com> 1494274281 +0000
committer android-build-merger <android-build-merger@google.com> 1494274281 +0000

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

Change-Id: I93f76bb45e1ce382d02076a5841a44eeaeac10fd