tree 9eb3b02d472d72a4156a052f60891666b1506f52
parent e3202456d65b3f54f34a196e79887ffcc25b9451
parent 7ab3e3e0887020bd503f28c3ffe73e445068a149
author Marco Miller <marco.miller@ericsson.com> 1555096846 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096846 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I4bb1227ab9b2ee21f68e5047c391df42f71e0e4c