tree 530d8708120a945be4c93a3db712e54ef17ec742
parent 6d401c987b75ce181d6c63cd0a4ca42d344371f9
parent 1e2b8629b198b98540de1f80d32186fe570e8aaa
author David Pursehouse <dpursehouse@collab.net> 1543141109 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543141109 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito to 2.23.4

Change-Id: Ic7f1300805afba45d80432ef250a1065df5e1288