tree 75ce359414003726a2205c34675fb47576a74e37
parent 12995cc362e61083d84b602687f51dc54f680d08
parent 60aed93adbfae23e512d74b1923a508ddfb00dfa
author Marco Miller <marco.miller@ericsson.com> 1553024006 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025630 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I0c30d89884cd96a8c3ce51a938ebfd29c8b89f80