tree 714b05dbfa5cae9923e47188af2e40172d5beded
parent 2683d5dd7620c8c99cad0816dbf5be00f5be870c
parent 3b971cf4271d8af081fc90cae59aa53ef6c858fd
author David Pursehouse <dpursehouse@collab.net> 1552954310 +0000
committer David Pursehouse <dpursehouse@collab.net> 1552954310 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.1

Change-Id: I04c3a23c06750c9942285c33aab33a8f18ad2114