tree 92ea157ba2bf39cc3e3dd95d7347e5492e32353c
parent f522a207e60af3e8cf895e681fb25278219dc11c
parent 9331e6a1c8b9dca8b9c2957b92a5cfa409440ea8
author Paul Duffin <paulduffin@google.com> 1480429423 +0000
committer android-build-merger <android-build-merger@google.com> 1480429423 +0000

Merge "Use junit-host instead of junit" am: 2d517a9a69 am: 021427812f
am: 9331e6a1c8

Change-Id: I9f31a64ea5be7cad8893a0f3d1097e2573b419f6