tree b6e8dde0fbe022c29ec7ecc5d7f880d8594e5a93
parent ae47abfb91d3997d18a657aa4e71c815a94cb652
parent c475938344ee735eaadab8ff0f99c5e34d857e8c
author Marco Miller <marco.miller@ericsson.com> 1560275599 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560275599 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I9b73afddbc728fb27ea756dbede0667289a1fd24