tree 3bfb8579fd1aaf5bbcb7564ea34f55e83ff283d6
parent f13d0beb6dabac8a759638a01c81535aae9ba460
parent cac2b4eb02de2767213dd56c5235951dfe6c0c02
author David Pursehouse <dpursehouse@collab.net> 1551954573 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954573 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: I4cc281946a4ec23540c2cf0f8a2c23e89bedda33