tree e49c4ba4c1a7a5571ebb4705eb922156e1759e1e
parent 1eb523bfc94c9744575b276f9a246578619a7a83
parent 16bbf174fd1c7f146d0e031e5322a4dee1cedb61
author Marco Miller <marco.miller@ericsson.com> 1554839224 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554839224 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I5c836bf032ec161c605439923dda34a75fcfadae