tree d475071da51ccd6b111611193f9a050ad06f331c
parent 59c1de36e85d81f62421a11e91f124e079e370e8
parent d5bff2bc4e7eb49040d8b8e033e2924bb363b238
author Marco Miller <marco.miller@ericsson.com> 1549401646 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549401651 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I9c3f3ccc58587f6256730ec97f6ed764ab7f9c84