tree a9893ea5203e08b660a3622c033c47c4d0c1efcc
parent 04c7c00131546725ecc30657bbfec3f75934a565
parent 9ef3d7ed7403900aaa23099be2599343cb406d63
author Marco Miller <marco.miller@ericsson.com> 1567712197 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712396 -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: Ia1adf1f501260da844a6ea8a2fb158a8bcd8020e