tree 6f69b8e9b4c66d65d491a55d76bd305570705a6a
parent 23fbf8243aa15b827b92e000c0b2fb10cacc49ac
parent 22d3dd7b6636b3f6ca3fe92a9376d3c601477c6d
author Marco Miller <marco.miller@ericsson.com> 1549483150 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549483165 -0500

Merge branch 'stable-2.15'

* stable-2.15:
  Update mockito-core to 2.24.0

Change-Id: I384ee18f3eebd362e07eeb29fd8cdc9ddf46c928