tree 1258fca6cca7bdb76f60d692605002730b0fef18
parent 4319259591d89034b0d08fdebcb2027aa9bfe584
parent 8246120a9bb8afd1214ddf96fb35a31ca5cf6d20
author Marco Miller <marco.miller@ericsson.com> 1567712229 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712447 -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: I3894f12bdf8bc080ab178c9ea287e36471b7349e