tree 0ffd074a3af1cd033fc5a6a37b1375f2e12446cc
parent d8d33dd9488549f015b9d2898ca8c48044e75eb3
parent 4daa7a794fcd3c81516ba8fa25bb37a366ac8927
author David Pursehouse <dpursehouse@collab.net> 1554784508 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784508 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I04a5c631fdb31c5632d16cded1727fcd0d38d6ca