tree fb4a2aead0705e26d8a526c54ff1574a324d58e0
parent 374426a588bfffc7d0657bffe05b65660b438007
parent c9998dc674cae988eb6230f54168f575656c2450
author Paul Duffin <paulduffin@google.com> 1488535107 +0000
committer android-build-merger <android-build-merger@google.com> 1488535107 +0000

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

Change-Id: I9576980cc267f0fdbb86d457acf52ba19bbf7972