tree 73fdf2cee5a26df371d0d8ac9e025f788d82760f
parent 80e9ed5e911abbae092d66d61e5b89c4a5855075
parent 996bb3a6cbcf12d39a2cb967fc62799beec95068
author Marco Miller <marco.miller@ericsson.com> 1549484249 -0500
committer Marco Miller <marco.miller@ericsson.com> 1549484249 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.9 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.8 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.18 API

Change-Id: Id592b1094ec34c0338e48a43267847ce3bade10d