tree 85e8de974c25bce7e361d0ddee96e5952b6039e9
parent 8507e967d662b6ff3dd874382136c80d6e24c5f0
parent 3fb6123bd1436402c0c57701f132c2e04722a3c9
author Philip P. Moltmann <moltmann@google.com> 1513339593 +0000
committer android-build-merger <android-build-merger@google.com> 1513339593 +0000

Merge "Add mockito-inline for host tests" am: e64ea0b85e am: 2f4a87c5c2
am: 3fb6123bd1

Change-Id: Idd26b2685f681dab1274b171cc6b9b3d3d73acec