tree 4a31df14b987cf892e1594be83a9db3a27cbcc51
parent 5d21902ab03e897f0b004343dbd5c4e1abc3e658
parent 7706edbddd57023a763a2bc19f8e26b9858c497a
author David Pursehouse <dpursehouse@collab.net> 1551954580 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954580 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: I99aff68c70306bb61c99b3e1f7d24b3a19d382e0