tree 93686bcd643fbe828c57c263b1840a7950447eb7
parent bca9baba2353253c98306972af3e76606438b23c
parent 4db638ea93d71f21de2f23dc42704a4f872cec62
author David Pursehouse <dpursehouse@collab.net> 1554774390 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774390 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: I7fb3c623c559b18e48ac3201ccab689b046ffb82