tree 9534db76a45279eac63565a8261d8481b61d1b3f
parent 5c8e4e9cacd5effb7828a58aa59c8a0284bfd831
parent beabd44cc187cd986c05eb1ac5289866081ebd22
author David Pursehouse <dpursehouse@collab.net> 1550636185 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636185 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: Ibd16c046a4b631b39bf106404b382e0c0af9c09d