tree c0829bf2189e43fb8a8f6ec1fea7a544dee867bc
parent 4daa7a794fcd3c81516ba8fa25bb37a366ac8927
parent 3faff25b8bf702fba4e910f9e5d1194029d6115d
author David Pursehouse <dpursehouse@collab.net> 1555031025 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031025 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: Ic267930b877097f47a62148b39df4a603ee3befc