tree d611f2af2181dce9d987a7a370d40e3ad1e5860f
parent 1e92b1fd0582adeea533b05d9423907239ca9069
parent 3db794bafd7f4a87024768fddc4363c05928b2b9
author Paul Duffin <paulduffin@google.com> 1493819523 +0000
committer android-build-merger <android-build-merger@google.com> 1493819523 +0000

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: a80a70f2f8 am: 810eb447e9
am: 3db794bafd

Change-Id: Ide6df9e4caade943922035b17a65bd8f73d9acd9