tree 41c4d625888245a1e2713df095c3e5660e766994
parent b7bcbe1dfe2c673298bf55e9f83c4bd9e411ae5e
parent 3715ef0815b8f3487f2f362cd7e8e57f2313980a
author Marco Miller <marco.miller@ericsson.com> 1549402525 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549402533 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ic1a83c07c9213a1381df4d57eaa3859444bc05a5