tree c373b8e37b782a6ef0270b83c49b6835ec560542
parent d59cfb69e44c9648b4a76e48707b249f9727f39f
parent d4287044faf8606f8dcb6b66e351fac094a3defc
author David Pursehouse <dpursehouse@collab.net> 1551954582 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551954582 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: If7036fd26b663f4e407ff4c08cc34f1eb5839057