tree f99785226d153d8b26513c32f68e54db62190be3
parent f1f7b261851a317d0f7a40a564e53d02cd681931
parent 648c062bb930d939af77d86ca708cf43083054c2
author David Pursehouse <dpursehouse@collab.net> 1555033327 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033327 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I2826551eea8f39c969a5e89e8ce51af085b677c1