tree d611f2af2181dce9d987a7a370d40e3ad1e5860f
parent 1e92b1fd0582adeea533b05d9423907239ca9069
parent 090ce68ceecc09780db4797277a3aaf8c7546a0b
author Paul Duffin <paulduffin@google.com> 1493819876 +0000
committer android-build-merger <android-build-merger@google.com> 1493819876 +0000

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

Change-Id: I2534a594a4f84a5a68463868f70093e0276cf125