tree e05073f8633dea2376f31b44528c7473d94eec98
parent 16f16eb09594ab0f74672969e8337844ce3b3d9c
parent 23913d1a8548a0241d12c18f7238cd4dc718d36e
author Marco Miller <marco.miller@ericsson.com> 1567712175 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712348 -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: I84dcf3e50c2b099ede1698b93d28eb6fb42f21b1