tree e32445cfe4f29b3de0a7d008ec965ef9a1212ed9
parent 062902794ff684c91eac5b860d3c488354997a21
parent 45890f7db507461ca1fd3811d3753c84812682c0
author Marco Miller <marco.miller@ericsson.com> 1550711583 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550712073 -0500

Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I14421b35cec81254f34e3165e988ec079f4dd254