tree 15999f1f4b598400b096e9736c7fe6f41df842ae
parent 34ed20bc815a0625199db23f9c78f3a5ebef8b62
parent 75df705a0f4e7f36050ea68fa8695325f2a691d8
author Paul Duffin <paulduffin@google.com> 1494273929 +0000
committer android-build-merger <android-build-merger@google.com> 1494273929 +0000

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

Change-Id: I5bba3b8e302bc7e3500eca46c5d31b1b0e3819e3