tree eea320b8dc9dbdd2b11e93fcd77228ada94d763d
parent 8a6e391b0b4998aa8c9c23e9e26598b0e55ab509
parent e2b549f85c64050e41040fcafdd06b451e9bd91b
author Marco Miller <marco.miller@ericsson.com> 1567712201 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712402 -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: Iece372086044e81cead1627dfd145c66a1c44cef