tree b3af45f2ae79df714024717672083fad9fbbf134
parent df26755a810a785f3ebf21b8aaff6769076f035f
parent 6f3aa138173a426316e699220b8565555f241af2
author Colin Cross <ccross@android.com> 1507770578 +0000
committer android-build-merger <android-build-merger@google.com> 1507770578 +0000

Merge "Convert external/junit to Android.bp" am: 885334531a am: 833c14eda2 am: d9fab9d84a
am: 6f3aa13817

Change-Id: I1abea99c3510b9cd11567b59591c0f15444f425d