tree f8099bc664c1a8901882ddd4b8c942e85ba0687a
parent 634fc5a417d88bfddcb64de9fb1ff6a97610ffee
parent 8293d4f26695bf9613941be4a16ae5a709b0347b
author Paul Duffin <paulduffin@google.com> 1480512867 +0000
committer android-build-merger <android-build-merger@google.com> 1480512867 +0000

Merge "Use junit-host instead of junit"
am: 8293d4f266

Change-Id: Ic5bb8ac0b30e42bb30952569f49cc74705f036c9