tree 4d242b154ad5083d8db1b1b3e8d509e3fbf59c4d
parent f7caf638f6d2e24d7a491f8fde6b7751afd7e60c
parent 54b4866c877dba93ff19d4fee477535bb98132b3
author David Pursehouse <dpursehouse@collab.net> 1554784509 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784509 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I23de6ed2cad7222b24461fb1c35518568985a4b7