tree 4c2d7c30c501bb24f9cc30c155085989b397532c
parent f58518ea9c716e1e3d904d50871051ec434290c2
parent 83f0d8dc18148ddaa185234151bd63b0c946f732
author Paul Duffin <paulduffin@google.com> 1494273951 +0000
committer android-build-merger <android-build-merger@google.com> 1494273951 +0000

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

Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4