tree b8b7942639597d9cfb676081c31e4e6822aba444
parent ef3591ac091f73873d56672f0335c9af5f18bc68
parent ca02d5d6b3b89b48583833963942e91d335dddbc
author Marco Miller <marco.miller@ericsson.com> 1549401553 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549401560 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ibd84275605915d346010f2d5ff79f6df072e10b0