tree f7bac913aece879e52eeb72d7cc955bedcb10d4a
parent c0cca27a899aa5e1800be786a6bf94253ea2c4c8
parent 18d95b066e54ca719cb3cf94ff0f5e7df0dd9194
author David Pursehouse <dpursehouse@collab.net> 1554774395 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774395 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Ib6d3c1b47c6fc47bfe7da00e5c2b602f386e3d53