tree c8b0a1d7846ddbf320ec283440a8bc11273b735d
parent 064ae07f55710034062ef2a36cd030abeee93265
parent 23b8c3fb592ca0180f8e26d785d49e553e446eb0
author Marco Miller <marco.miller@ericsson.com> 1553024052 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553024052 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I659e7530cc9390373156ae64189babfaca3bde11