tree 004a60055ae662ad65a895a6a3b9d79b62159082
parent b86a20fd870073c014893ee82d8b8ca8ef793b85
parent 0cbc06890eb131fb5014a88c8f5a111d3a6abb0d
author David Pursehouse <dpursehouse@collab.net> 1550636171 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636171 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I9aec0ab6fb22de58be297bd31384569bb0f20b1b