tree e64db57b7692964dbf48779a4ad18fc677896ac3
parent 38c8442e9114307e137b4971bcc55b6134a659f2
parent fa752e68f5d313eeea18fc5e526f7eb81e32072b
author Marco Miller <marco.miller@ericsson.com> 1549402195 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549402202 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I0cf79b45de4cffd5cdaa995359e704f07fdcde0d