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

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

Change-Id: I502b9ca53e8bb988ed4b3bf253c5c4259abb5fa2