tree 506670d4a913ce26f560f2a5e7c20b5113775af8
parent 299973d5ba85feafcbbb23aaee11f53422e194a6
parent e2b686373e86b005269011568cab8108229c2bb4
author Marco Miller <marco.miller@ericsson.com> 1567712249 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712484 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ief21bd2c4a8edb71ced727a4ca2baf5787c68de5