tree 18c120bcf183a1daf7c8d1d8e382f6de29d0d652
parent 24689276a6930393bc9abb190087b919dcadc950
parent e11ae5e1368d8f4d4572319ebde5b21c27855e93
author David Pursehouse <dpursehouse@collab.net> 1554774400 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774400 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: If102ff224babe260b2dd88f361bec76c708b9c66