tree 55d7e71cda0a4e60c101c818c81bdfbe65a9b72d
parent 66a4cdc1d348f75c2badac931689e4adc3ab547a
parent b5d01e5fed649a93077b6eedcc02494bb8d1737d
author Marco Miller <marco.miller@ericsson.com> 1549401824 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549401830 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ief7ea7f1a9c7ab6c799d72d33681a68a67dd6943