tree f30d02243175a67b91396b4f396f8ab23e361b00
parent 252bfd5fd0ec91e5f75dbb50f13a30b82b925f27
parent 5717a437d135564d5f8bf2aa0fade17edb7b15d3
author Marco Miller <marco.miller@ericsson.com> 1550696144 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550697428 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I30c7719dc96f3cdb97d6b6091e4064be92167ca0