tree 791d4a7e3eb8d00c7e95ef6e7279fc9d4b8dbbda
parent b2123e27a37c6e15346e9c2af141cf3c2c849c6f
parent 6a68e4d22c96bb749ea6ce4be2bbfb6839d9ab13
author Marco Miller <marco.miller@ericsson.com> 1555096828 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096828 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I445b28d42005f43103e70c4f6eb8c8b675ea33a2