tree 4cacc6108865fc53f8ea3a2d1a200f7dc1a587db
parent 68308ed018cfca92d0865541bafebc37c58933eb
parent e278339bc4f07f3b4d82f02b5e40d9c7c5d24044
author David Pursehouse <dpursehouse@collab.net> 1543141343 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543141343 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito to 2.23.4

Change-Id: I3204cd23b1bc467db327f6090ef0253574781252