tree dfbc9668f7307248317683f03a7cff8ce7013115
parent e90ccc3b852a421d25bcf4ed0edd941dbd1d72e1
parent 2b32c23bce534e8396581fdcf0cc351e6008983e
author Marco Miller <marco.miller@ericsson.com> 1560275594 -0400
committer Marco Miller <marco.miller@ericsson.com> 1560275594 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: Ic70cdc6ac525aafbb359fcbcd5da4ee3d94e8f14