tree 38dad8cabc4a9d91c896454035f48b26c94a9690
parent ccb17c9fd9544a55a3e847e8ee7102888d6af5f6
parent f1f7b261851a317d0f7a40a564e53d02cd681931
author Marco Miller <marco.miller@ericsson.com> 1554839228 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839228 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I3423d7b81765bdb1db3879904b5f7d7e940086eb