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

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

Change-Id: I8cc071d266f405dd4987c4cc13523e96a2936bd7