tree c8d8887d944a0326fe07a2f4a340bc5a6edabd7a
parent d9ce2258ca4fc275cfbe663dcbe36178093cb378
parent 7c5cc2d4022dcc93498ac8d4bacbd49d1fcec441
author David Pursehouse <dpursehouse@collab.net> 1554774399 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774399 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Iaa1ac218ac4d883178fddc502a02e95fbe29dd23