tree d16fecde0b72de454c3dcf99e8ed80b362d823e1
parent 6ddba855698a31358856bf3947450c1d1f41bd14
parent 92f4f4d4dbb7ecead434930e6d79cc5e9da0d491
author Marco Miller <marco.miller@ericsson.com> 1555096963 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096963 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I03a1783272028ba3d2c42f5f4c2cfe9c072dd599