tree 668496be5750c2eb0cf7cb34b4a773e139498a7f
parent a11537c113bcdb80e570cc499d245d284b7a1639
parent dff49fc473fc69a26599eb1525ea95959891f921
author Marco Miller <marco.miller@ericsson.com> 1553024002 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025247 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I90ab82089113fe94ff307cc6a2b28f32efba0a5e