tree fcf976253b861b5d5efdc235ca87c9b4b2c81730
parent 1ecf6ca154baff0d74dd19731398a57419dbf416
parent a7489aca54285ab534a481681812b085c50274bd
author Marco Miller <marco.miller@ericsson.com> 1567712204 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712408 -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: Ifeb02ed6bc9a1c2383a0a7bef9b6eb0b71a1e12d