tree 3131b939d4ad72268d8a41c4f97bd5eb3fb66410
parent f3dd8a38f983e9e4efe8809c1a09c5a119b813de
parent 8a1869cb38c996e7e051dd3de4569db9bb922586
author Paul Duffin <paulduffin@google.com> 1480429441 +0000
committer android-build-merger <android-build-merger@google.com> 1480429441 +0000

Merge "Use junit-host instead of junit"
am: 8a1869cb38

Change-Id: I2a316a470ad6b810f9972230015210f619dbb321