tree 0af0fea2642bf05ef117c5e24cbb0afdf188ea60
parent 4467b79592052598a362ff77884fdcce67d16cb4
parent 6ac5293751cf29975054e65547c270b842208a02
author Paul Duffin <paulduffin@google.com> 1481115632 +0000
committer android-build-merger <android-build-merger@google.com> 1481115632 +0000

Merge "Replace core-junit with junit"
am: 6ac5293751

Change-Id: I855552fe62801b2534ef63c2c62919bbd845a9af