tree 7ff04ae18c42df8260a195a6718f18a3030439d6
parent cc8bbffbd6317d53bc0215571af278e3abe8fb7e
parent 9cb5f2815dae97560ab10ad19da65db5d35cc237
author Paul Duffin <paulduffin@google.com> 1481116572 +0000
committer android-build-merger <android-build-merger@google.com> 1481116572 +0000

Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b
am: 9cb5f2815d

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b