tree 92ea157ba2bf39cc3e3dd95d7347e5492e32353c
parent f522a207e60af3e8cf895e681fb25278219dc11c
parent 2d517a9a692a1522dc6a4673a685920144e52862
author Paul Duffin <paulduffin@google.com> 1480428789 +0000
committer android-build-merger <android-build-merger@google.com> 1480428789 +0000

Merge "Use junit-host instead of junit"
am: 2d517a9a69

Change-Id: Id6e4a900169a73f32ce87464b96afb69f0cdc87e