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

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

Change-Id: Ied6f3283c12b365d9b23baa035f629c7a2d3a337