tree 0e08c87b3316fb4a0c3c77dd00f0ecfb9d9eb567
parent 89fb1b9fdc7f5c48d4983fad62af62c1b780e428
parent 6423c63a15ddafc65c1687bacae15d4c583d5696
author Paul Duffin <paulduffin@google.com> 1481116051 +0000
committer android-build-merger <android-build-merger@google.com> 1481116051 +0000

Merge "Replace core-junit with junit" am: 2b483ecb8b
am: 6423c63a15

Change-Id: If83290a485d16bbfc6a0a38d73124c3b9d63128d