tree 14db611b88e90e5c12f29272d0c3a9d00c9cbfc4
parent 110eb785b6086df66e0af548712dbba6ef322482
parent 7181f11fda587e4307b3d003f1d78d794289bb93
author Marco Miller <marco.miller@ericsson.com> 1555096785 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096785 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I32c9a8edf65bfb8f2d99a2515a299b452ab2340f