tree bc695818b57426f1f9e4d823ab312e41c7d377cb
parent 1dc8297eea797642c5b4b5d8d669406db5f07214
parent 735438ec62fba2c50dd28470beaff94fcb048d9f
author David Pursehouse <dpursehouse@collab.net> 1554774398 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774398 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Icb0622839b278ccb8fa9bc8d65e754c1afbb29ec