tree 42421eecc1167bfec733d0858947a5e72c0b1e06
parent ff217fd086ecac137321c1265d0cc1a15194decf
parent 9e1e4dddc8aa0cae8279281488f8a6bf4f453192
author Paul Duffin <paulduffin@google.com> 1481116980 +0000
committer android-build-merger <android-build-merger@google.com> 1481116980 +0000

Replace junit-targetdex with junit am: 8ea811b59b am: c191dc53ab am: 5b2e59695e
am: 9e1e4dddc8

Change-Id: I88152190cf69353fc5461b60c5b66d4d2d9b54a3