tree b12aa9c77172cf219657bfc49570f7b1c33d6cdf
parent 4413bca66286935bcc736fc7bd297cb016cfd85c
parent f6ead56dcd1b26069da1c64137aa01865b2f69dc
author David Pursehouse <dpursehouse@collab.net> 1550706621 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550706621 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I14a2a6ff4b39471c54fecf59446d67cdc12ba3cb