tree 526cc379ee5da45702c0e554036fda16440f821b
parent 109ce3dab5cf25c17ff248805d94430e584e6076
parent 51c9e2f2ee1a5e36b35079d1638de1d0050b615d
author Marco Miller <marco.miller@ericsson.com> 1567781446 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567781917 -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: I4f7d47d1db2b8168e7fea9c950c7b82ff86f05e5