tree 927b21cd75bb82cd0debccbc3ddea0da286beeca
parent a42535c935e5c1d2c7089d78d2bba6a07fcb95c0
parent 7ecf39873e9bda3cd45f6185b5b816c6eac71a55
author David Pursehouse <dpursehouse@collab.net> 1553015387 +0000
committer David Pursehouse <dpursehouse@collab.net> 1553015387 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: Ic6c93e69217159c22c558ea6b31750e85d1391ec