tree ee8ae5eecd02c69ea9da647b44e75c6efdd9d963
parent ce2ed64ae294ebd34dd11b5e63a0c8cdfa12ac6d
parent d40a379ec8949c172bf0d111eb66426c46e2fdd6
author David Pursehouse <dpursehouse@collab.net> 1550709476 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550709476 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I9adea45e9b6920a8acea39639e39ba1e8b4d49a7