tree 366926d4678db6600ddffc6c007785c683ccc67f
parent e124a19f43aec1c7a66cafbcbd7fc6b6fa193a15
parent 54475236fc0d8936e2e0413239d2e3352d6d3157
author Marco Miller <marco.miller@ericsson.com> 1550703100 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550703100 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5
  Add the standard LICENSE file

Change-Id: I91f54b2e157c292ccf3fbe557821257a2e771394