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

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

Change-Id: Ib163223e8f3029d421b6d687059374499346692a