tree 319c8f80683c368da6bb68f48a514a7705fe1ca8
parent 9d13446e533c3442d7478008049f8539e75d1439
parent 8521f7036145fe36ecee19d2bdf432be27f43427
author David Pursehouse <dpursehouse@collab.net> 1555033327 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033327 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I20cc94e38f3823279efdffde58a763fc692c15d2