tree d3e3fd0e9973e9ea2f5ea9939a9c3524e333f243
parent 81c03d779123f2d6a3b6013e79e43939b2936f14
parent 48780a4a2f8fb090c671d5ad7212424ebf517316
author David Pursehouse <dpursehouse@collab.net> 1559259732 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559259732 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: I5bdf7f6aa80aafc52ddbf9fc8e7f4f5c88e5565d