tree 42421eecc1167bfec733d0858947a5e72c0b1e06
parent ff217fd086ecac137321c1265d0cc1a15194decf
parent 5b2e59695ee27af2486d706a9e1733a0464964dd
author Paul Duffin <paulduffin@google.com> 1481116502 +0000
committer android-build-merger <android-build-merger@google.com> 1481116502 +0000

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

Change-Id: I723c0dc39c3b5ec3300a296cd6ac44e761615249