tree 207c1c8217c7f2ebbd4f89f8e27cb9e56ab8e552
parent f270cf571a3bb6f2b2ea1e85ff604111f3c28128
parent c6008b15ecf277b989e962035364c144aaf82ba5
author David Pursehouse <dpursehouse@collab.net> 1559259730 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559259730 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: If12ad685679c10985c491856ce42d63ef2844fa7