OSDN Git Service

Merge "Use junit-host instead of junit"
authorPaul Duffin <paulduffin@google.com>
Tue, 29 Nov 2016 15:12:46 +0000 (15:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 15:12:46 +0000 (15:12 +0000)
am: 6063357ae6

Change-Id: I6522cedeb522fa01530d4f31b6505b4d4c265312


Trivial merge