tree 8af1f77adbdd19942630f768b7dd0a5e8e909152
parent 199d5468de11f2d0f51109ac38b216e6e1105a24
parent 1712a27a44ad387da1d6beeeb1622844db4f5e19
author David Pursehouse <dpursehouse@collab.net> 1555033329 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033329 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I88885d93424a9f9648feaf43907453d1f529a2b6