tree b3af45f2ae79df714024717672083fad9fbbf134
parent df26755a810a785f3ebf21b8aaff6769076f035f
parent 885334531ac5ed3033608af0168ec97a04622379
author Colin Cross <ccross@android.com> 1507758468 +0000
committer android-build-merger <android-build-merger@google.com> 1507758468 +0000

Merge "Convert external/junit to Android.bp"
am: 885334531a

Change-Id: Ia34bb6364ad04f69ee9efa1c28c2b55bcfbddaf5