tree 5e02dbc95a147c9c5664fdd501340002c71c27c3
parent 10470e3abf78ddca964938d3547593b93c3c5479
parent 8d77dc88f1d1224102a4e63efb62037ae946109d
author David Pursehouse <dpursehouse@collab.net> 1543141217 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543141275 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito to 2.23.4

Change-Id: Ic361b180f24d59b0e208e4ee2807de3f4875d7e0