tree 8303beeb86f2019733e23fda63adb21566e28fde
parent 54b4866c877dba93ff19d4fee477535bb98132b3
parent b493b8e42eb5c464d805deb7e33f5bb4b538d498
author David Pursehouse <dpursehouse@collab.net> 1555031026 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031026 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I0fca9b0d97252ed49425aa0638b1b045e49dc83c