tree 0a1bac425c978a143eac99f3ab5ce0bf1e729073
parent 775ec86c48d93a5c0ee3dae94ac881154aeab37f
parent 4d0a75dc75a9bc03e0d380932ddfcead634a5f2d
author Paul Duffin <paulduffin@google.com> 1480518328 +0000
committer android-build-merger <android-build-merger@google.com> 1480518328 +0000

Merge "Use junit-host instead of junit" am: eafda48599
am: 4d0a75dc75

Change-Id: I27ca922115b308935d6f6482c34099496cdfd9a0