tree d8f1c3da15653d373f9040d26b9801b673b2e517
parent 0679a44c756c7493c36915fcd11f14d61ea8e158
parent d292922b066690ea058ef8f48dce3400f6af4c9d
author Marco Miller <marco.miller@ericsson.com> 1567781461 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567781947 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ie0f6a05b328fca5c238b7a09104d64b0b361ceb5