tree 031101c9859d7ed5d50dc9d95576e56dfd7cb0be
parent 02135b3464b0cbbc2f9af5a6c5b5b13b80e08858
parent 0b89130615ccf1a4c3f362ea815d781e747f3b1e
author Marco Miller <marco.miller@ericsson.com> 1550696138 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550697268 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.24.5

Change-Id: I3f173c816941f80986084821a44452e6cb52f526