tree bae64a1fb0985c92f613676769dbbfc02b7ec3dd
parent 44e9b81c54897fd9f41515098fda4098b1fd207e
parent edefe593e3c2ad2f2eff6da8c77f3117b35f4609
author Paul Duffin <paulduffin@google.com> 1494326163 +0000
committer android-build-merger <android-build-merger@google.com> 1494326163 +0000

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

Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f