tree cbb9b4c452b13eb6076a646df843460db72879cf
parent e4660965e05ae58889c683404efa517dcd940bee
parent e79bddaacdb8565902c7fd2bda9ef140b8014dcb
author David Pursehouse <dpursehouse@collab.net> 1555033334 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033334 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I8e953806ace53c5fff010296510a8910328f986f