tree 74ff8d455e34638d3a2b6f73af1428aff31922c6
parent ed037e37cbcf4197faca90e08c61ba4fe85020a6
parent cdd14ec7bb6423848de5d2b0cd3153fee51a8ee8
author David Pursehouse <dpursehouse@collab.net> 1550636183 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636183 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: Ia33df3961769617a3d49b80e384aa344dde73ffd