tree b0f94cb4e04caea4701b0a77095008a438157ea0
parent ea4b4a8603bca692274bd9c1bde0ac1a24b2d5cb
parent 34ceea047bf3141bcc4791fb7d8172c381cff52d
author Marco Miller <marco.miller@ericsson.com> 1560275597 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560275597 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I7b84b8af5e3e8b2a4e2339a72a1fc4fdb0e605f8