tree e61786928db2dfaca4e7fbfaca4b2bd26a38a8b9
parent f919e814393bbd401bea8fec08e335661dce71c2
parent d8fedb634b82c491ec4b55083f91f6f18232919e
author Marco Miller <marco.miller@ericsson.com> 1559239085 -0400
committer Marco Miller <marco.miller@ericsson.com> 1559239330 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: Ibd562e9029f537b0bd6b8f9c82757394d06c240c