OSDN Git Service

Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e
authorPhilip P. Moltmann <moltmann@google.com>
Fri, 15 Dec 2017 11:59:37 +0000 (11:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Dec 2017 11:59:37 +0000 (11:59 +0000)
am: b4fb45f755

Change-Id: I6cecbe5ea337156f148a45e4c51782b62af96eda


Trivial merge