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

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

Change-Id: I5310d18a78f134896a4fb898edc995afa9ce2e95