tree 8ce4ada1411063e149455c6515e0c16a0a4a180d
parent 39d05f6d0592d626f13148933fc2432b7704701d
parent c44bde3d1f8e1c0f041c6f5f74b73fae267e2e3e
author David Pursehouse <dpursehouse@collab.net> 1555031024 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031024 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: If27f33c1b04f806ccd052adfdda085af57dc2efa