tree 28b362321551203708bdf5a9b67fa46aa23f8411
parent ec2243dd02dc8cec4841b60adf2e718c241495aa
parent 8ed839ee0a014281dfcc608238eae4384a0d9d00
author David Pursehouse <dpursehouse@collab.net> 1550709477 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550709477 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I63e8b64ec1a55dd3771eb212c08b869a7a5c68ff