tree 439e2bac40ad88a841cd496d61ed54f4bf834bad
parent 0abec3991b47e039eba18cd27e22b4c669f5cfbb
parent 6b2a3b6366f87c2681f5cda82622e3a08e010860
author David Pursehouse <dpursehouse@collab.net> 1549509503 +0900
committer David Pursehouse <dpursehouse@collab.net> 1549509503 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.0

Change-Id: Ieb95dc9e2d79fdef906e72d96af4c00707bf8205