From: Philip P. Moltmann <moltmann@google.com>
Date: Fri, 15 Dec 2017 11:59:37 +0000 (+0000)
Subject: Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e
X-Git-Tag: android-x86-9.0-r1~291^2~52^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b706aed07c22078e67c993d5be0de1c448376608;p=android-x86%2Fframeworks-base.git

Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e
am: b4fb45f755

Change-Id: I6cecbe5ea337156f148a45e4c51782b62af96eda
---

b706aed07c22078e67c993d5be0de1c448376608