tree 3eb0cbdab8782e571817e009a4c03b6dcb1c224f
parent 68c5a9d4c2a39b2db9318717bca8046f5f84c751
parent 4048524ec76819687815fcceb72cf4227cf716ac
author David Pursehouse <dpursehouse@collab.net> 1550709474 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550709474 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I7e0590f0050542df8e0ef1112a6ed37c541d6fcb