tree 0eb73c5606a650e8546f08c52dd81ca96dea763d
parent 257a9c99c18f48e305d24d2885cca1042ed1b673
parent 03a9af8cdb2202b69f33b6adf5e12f8bf66440e0
author Marco Miller <marco.miller@ericsson.com> 1567781449 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567781923 -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: Ia91926e4d1bd0058adec79c27c6bcdc4addbbd50