tree 9ad08bfa0773b814e0ecd735d0393e4414cc6c50
parent faa5eebee5b9ca4d37cb18e2ae4c82aec711583f
parent d9a62c9db2ee365fbec97d3ba87591418a73cbe0
author Marco Miller <marco.miller@ericsson.com> 1567712216 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712425 -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: I0ec9221bf5ec7a0338afd780946115a3b4da6134