tree 1c559b6fdeed1c5ee48f1b6fd2cb8c53c6c9cfd7
parent b67f3f8a28246f297bdbea30c42cdc94312abf22
parent 3a9e4c7abe40578e465e4cad040ef67f6e5b5a76
author David Pursehouse <dpursehouse@collab.net> 1552954307 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954307 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.1

Change-Id: I1dd58fee2bb28f05da58fac2df77b681ccab43ec