tree 4010319ceb427ca88135c95ac6cce07e6ed86c1a
parent b1cdabc3acb81bf0c148040de9acda8bd3d6addc
parent 2a6e6d7aaa6638418060684bdb5614ac8c45fc92
author Marco Miller <marco.miller@ericsson.com> 1550696140 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550697302 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I9626e93f61badaf8e9078d360ce19c2d7017bc51