tree ac4d3fdd505773880d88c9f880a2b4d5b7316114
parent 7888f748c667346b81aa65e40d20e3f4ae4dd2f9
parent f688b14f43d38ed36f2c51bdc11754b700fd6c23
author David Pursehouse <dpursehouse@collab.net> 1559259731 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559259731 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: Ibffbb4e7f06207b7f0ab6cd37e26930bfc0101ec