tree 348c9a2f0a6b4292db755ab9031e785520a3a0b1
parent 56364c9e1eb37cd7b6d970d395f0c64dd1128a01
parent 9e2452d42119a9dd0c6a2afde901aebb2f4784db
author David Pursehouse <dpursehouse@collab.net> 1555031028 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031028 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: Iba1358e97eac02cd65f8ba40b25e64554dfa789c