tree 25f7bb199e508335f721a60c4228cb7126e99c20
parent cce7041e3f738259f2e75a928b53e7e448a3e11c
parent e4660965e05ae58889c683404efa517dcd940bee
author Marco Miller <marco.miller@ericsson.com> 1554839234 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839234 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I539ef0711cfb772b54f1ee96d782ba5695555dfb