tree efed747e917ee5d84ca0f4db94190d7ec59905df
parent c78c523ba4c4db82a8c94ea830b7b3b1e989914a
parent 84daf42452e2d9d284419440fe4c9ebf2a0b60aa
author David Pursehouse <dpursehouse@collab.net> 1553015383 +0000
committer David Pursehouse <dpursehouse@collab.net> 1553015383 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: I34a55f3f80c6fc006facd1e50003568f40f1d3be