tree ebacffd635c4bc4f94ce68f8999030c739b2551a
parent 48737892afb6bf8736194fcc8b6fe8fbb8d81b64
parent c0b2cd2769551a36bdf9e673188b7c6ca4f21e98
author Marco Miller <marco.miller@ericsson.com> 1549400822 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549400882 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I10f72132883741d80e57b3ed4e737391d9bf16fd