tree 9c32ea5cd2b17485356d985dfbe68c0c45e83946
parent f46c5b47f329481746d9195527ec41f009e51e93
parent d5086554f24b6b68ab31323a876e8c7b6b975e26
author David Pursehouse <dpursehouse@collab.net> 1554784511 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784511 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: Ia516cb5b6037c6c99cf5f0c4fb7ce90ebf2de883