tree 4f3fd50ba88c04580ab5c1052c31946ef08c600c
parent 39a2a1e4d0935b57b11e8694e63faa896bdcbbe2
parent cacba6337bdd1a83ef49c9d3daf8805f0a454a00
author David Pursehouse <dpursehouse@collab.net> 1550636174 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636174 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I923794d45e3fc34f095ec62718950ee40dbdc819