tree ed9081e9ad329b6614a485e8b770c4a3f332687a
parent c457bc3ab94879a6ef8270a3263e5af9043c64db
parent f9c929df5e03a22a4c83fd021a79091bd721b10e
author David Pursehouse <dpursehouse@collab.net> 1554774401 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774401 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Ie07ffdb1142b01862a0a18a3b0f9b920402613dc