tree 326a29c4461b2cf297f47772bb6577012544cba3
parent 3e2baf2ea3dfaa9c861b603db11caab9ed511d9f
parent 1f7c52f3ddcd692736f0e4d15a6a3d50a343a705
author Paul Duffin <paulduffin@google.com> 1481115581 +0000
committer android-build-merger <android-build-merger@google.com> 1481115581 +0000

Replace junit-targetdex with junit
am: 1f7c52f3dd

Change-Id: Ie10f04fbf66a9c1963e733f5c1d2ef10917a41bf