tree 196287f191c2d893c8cb445495d5b768546da9fd
parent 8c62f25502ded5b46519997f4a2f86bf89cafb0a
parent 5c630e774533e4136d59891a356e8a3d3223e7d9
author David Pursehouse <dpursehouse@collab.net> 1550709478 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550709478 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: Iec63e3e19f77853d918c3c712d2877ee235234d4