tree a464993ea8e19486067e45d16b630e03f716e105
parent 80468a15a05de1b0b2a992972fc05b9c50b1aea6
parent dbd31c2986fb7aaff142ee71e696cd5737fe0865
author David Pursehouse <dpursehouse@collab.net> 1552954309 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954309 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.1

Change-Id: Id11ea87b3d391b4c4d94f6c65d28632704c4baba