tree 798847e3ddd6c50a3b956c3988de973729d692b6
parent ed74546c6fcde1241dfcf35414b3be73cb2cddc6
parent 21c7cf50cd3a0e3e9bbc4830f66656ab4c3da151
author Marco Miller <marco.miller@ericsson.com> 1567712239 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712463 -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: I029da4da489c28983574d73f19d966d0f8202e99