tree c7ec7c75b8ae2152f0a66e1ed9261f81ebc34d46
parent 066cf806fe060dae8558595984ca7475631eb1b2
parent fc28fd5d9c3171b9162c26605028c89290dbb380
author Marco Miller <marco.miller@ericsson.com> 1550696136 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550697239 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I7d49292d5e3f4ac2f40b99b3e2429cb461d3a098