tree 117dec33903197f8597be34c96a29586b913269e
parent 61a92927e1372081af835db956840769f0511888
parent cc659507e781f2b1a92b7686a4ef0c89d9f25273
author Marco Miller <marco.miller@ericsson.com> 1554839227 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839227 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I0fb4b5c606da9e93c64c0cc4c732215374972010