tree e7469d39ab0b518473e094c867375c416d9104f9
parent 54cd06a16f522785b39aafe212cca349bf114879
parent b658893fa7196a7707da0622cab81ebda4224e5d
author David Pursehouse <dpursehouse@collab.net> 1554784510 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784510 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: Ib90ef3f582fa02000c51636eb9c289c9bc3a6121