tree acd32317792db578e2f46efbaa9b5560421b93db
parent ad72bf8b500498e1ddb4b2754c7557d606214605
parent a80a70f2f8c5e32e7b1ec6c78c4f7c3b3500102e
author Paul Duffin <paulduffin@google.com> 1493819164 +0000
committer android-build-merger <android-build-merger@google.com> 1493819164 +0000

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

Change-Id: Ie19328205f8a649f8dce9cdc1cb73a0be212aa41