OSDN Git Service

Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72 am: ced2263d48
authorPhilip P. Moltmann <moltmann@google.com>
Fri, 15 Dec 2017 12:00:25 +0000 (12:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Dec 2017 12:00:25 +0000 (12:00 +0000)
am: e360d51476

Change-Id: I2fb154f48bcfedecb5dbd8ccb2792ba34366ed71


Trivial merge