tree 361f4714fc5498c3fecc7c16a7690ad3fc896a7b
parent 16bbf174fd1c7f146d0e031e5322a4dee1cedb61
parent 6cf7102a593ce4bc7385ff371c7a183d13c4fffb
author David Pursehouse <dpursehouse@collab.net> 1555033324 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033324 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I367f5dd2d209c48cfe62dc5bf54930212aaf34c5