tree bff517b1582390961522915d9f5c75a66a895835
parent 27af2cc159aa64d1834fd794256dc8ac3d726e5b
parent bfede5f0c73f0c7bbe6621cc1461e1bf2b82e964
author David Pursehouse <dpursehouse@collab.net> 1554784506 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784506 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I8211bd0dfa95eee54f636e2409ef9d67dbc49ca1