tree 4b547c6b3efba486b97f1aa1903339a8fadb5cd3
parent dd4375b98905bbf95decd7149d13b82562206278
parent 86e16825cbdf7f65566f8a58fb9a70cb89fa61c2
author Marco Miller <marco.miller@ericsson.com> 1555096815 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555096815 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: Ifc5685b7be16b8bd0baa11645473a8a214f1f5e3