tree 201267310132b624b381403d7d07b977b1d4b8a1
parent bfede5f0c73f0c7bbe6621cc1461e1bf2b82e964
parent 176aad45a309c88265914f994a0a8fa6e6819465
author David Pursehouse <dpursehouse@collab.net> 1555031023 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031023 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I443e7bdf4475a8e7bd07e3124f9cadeb5fb93bcd