tree 76c18895de1f697544d761b86fd6e0f871045c6b
parent 5506649483c16f9dc3bfa044b710c0d0cdb04a4d
parent 7d5e25215854ef01d79a5e337e1d7fb7e4be58fe
author Marco Miller <marco.miller@ericsson.com> 1550696141 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550697346 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I28ebbd706795e879929a5df98dd3e64866d953ca