tree 18c120bcf183a1daf7c8d1d8e382f6de29d0d652
parent eae1106d0e05a4da75f9eb1a717d779033443c18
parent 56364c9e1eb37cd7b6d970d395f0c64dd1128a01
author Marco Miller <marco.miller@ericsson.com> 1554899625 -0400
committer Marco Miller <marco.miller@ericsson.com> 1554899625 -0400

Merge branch 'stable-2.15'

* stable-2.15:
  Upgrade mockito-core to 2.26.0
  Update bazlets to latest revision on stable-2.15
  Update bazlets to latest revision on stable-2.14

Change-Id: I30afb2fb1306af21af6cee77d082712520e9c902