tree 37dc440b1678ce4d81d0883eba523a38f1d3c4af
parent 68c57c2cad62c3cabd216904fbc04983332ccec5
parent 305164bac5d57838433c670b68f05ddb7e52b941
author Marco Miller <marco.miller@ericsson.com> 1549402280 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549402287 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ia2d7768fde98b572517f91f995fbffa7fe974737