tree fab261519923a66a3d1bdb58b7a2530078e07c98
parent 6ff95276d606260a3704b7c5a770f7f200751379
parent 6ee3745b50e2f84f3243f9466d5070b8b069cd18
author David Pursehouse <dpursehouse@collab.net> 1554774389 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774389 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: I8167d84265221d2c3015c6e981bb40541ade8a8d