tree e3f4d5fe5e9a440e0fa05a0ab38fc3bea84df16f
parent d5086554f24b6b68ab31323a876e8c7b6b975e26
parent 8cf6b194900ed519a9428722e92675bd953f2898
author David Pursehouse <dpursehouse@collab.net> 1555031029 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031029 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I9bede8e7cd3c93525d78af23462740585df5e7f2