tree 51e11ad0f505205a2b4e5883ec30154549c31e91
parent 28824e165684f0610c641ade8c8275184e622c27
parent d388b91c5e3eecf9eea3dd6062b8f74c04bb2488
author Marco Miller <marco.miller@ericsson.com> 1553024005 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025592 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I056a98014a074e9ac7902923453fe3672f169b91