tree 7a3dea1380020f1aa2a6b6d27ec1e34503dea0ab
parent a29e0e4df26a38fa203d824ed69e62297110cc4c
parent 90aa779717cbb8c671bdcad4bcd528df4ffe0a3b
author Paul Duffin <paulduffin@google.com> 1480418537 +0000
committer android-build-merger <android-build-merger@google.com> 1480418537 +0000

Merge "Use junit-host instead of junit"
am: 90aa779717

Change-Id: I4c088b5888f203303e90d3f884d4419ed421e51a