tree 6c2cd170d8e15b96146afb336cb53a36d534c991
parent c8c76582810b686e53b43e1d470ee46f183805bb
parent 52799a717b98e8dad1baae8fcf41bda3d4acbd01
author Marco Miller <marco.miller@ericsson.com> 1549401331 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549401340 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I3560cd8ec478a3c68b422c1b7c183b036942de4a