tree 885554b9bb5667dbbd1c902632c1800d3ff7034a
parent 41b64e44c2358ce583ab7c503e4a2f24ca09814c
parent 68fcb6a4b176fdc6d329aab5886423e582546d72
author Marco Miller <marco.miller@ericsson.com> 1553023999 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025143 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: Ic87cf6bcc9b621e48fe12dbb8dddbe60749b3c09