tree 4b95ce0d7cc704dfefa38a65e31325e246fcc963
parent 3775f56966a611e39df1ab7ea4bf083992588c4f
parent 054c5e6e85500d05a5d872d6064a812e937fa059
author Paul Duffin <paulduffin@google.com> 1488552736 +0000
committer android-build-merger <android-build-merger@google.com> 1488552736 +0000

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: dc8b745037 am: 8937acfca0
am: 054c5e6e85  -s ours

Change-Id: Iaaf7fb56e0f2e49f54d9b13a10a7ed2b50fde92f