tree 348c9a2f0a6b4292db755ab9031e785520a3a0b1
parent aaf01affa5d92db778b1853d86a05a000ca980b2
parent f6ade5a7ef864c2c1987d59c4c7199ebd3c5d6b3
author Marco Miller <marco.miller@ericsson.com> 1555513662 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555513662 -0400

Merge branch 'stable-2.15'

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: Ic04964616cb47dd6bcaae4eedb9d4e9090741bf6