tree b21f36c525303c24a7701e8207ab6d26b08d7e27
parent faa0f5d0762ecea7398d22a2a0a197137266ddfe
parent a5d70a40d1b4e5d4964d9e938dca8672dd634521
author David Pursehouse <dpursehouse@collab.net> 1550706672 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550706672 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I61dd307f552aee5ada31f41d8c07e18a1020dec2