tree 28e1228029e5dda2406db3a5ab0718d1bebf995d
parent a1fe02160c5352ca781cc3aa6c6cc94d033f96d1
parent 9699d6c2b7866577c566825a5178e7ab8683dccf
author David Pursehouse <dpursehouse@collab.net> 1552954305 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954305 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.1

Change-Id: I60484819cea7616d963f0b22ff77b86aece847cf