tree c05b9cf69866cf466b6030c70a82807ba449915a
parent 9ba4f66847319550492cc56a3ad9462d49d79f8a
parent 98624c15608dab2924adaebb78de102ea0bc249b
author Marco Miller <marco.miller@ericsson.com> 1567712219 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712431 -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: Ic45716ae4b5cc9a6e5060f3f53f36ef0f7192232