tree 90eafed8f595193118d602c158013493d42c2635
parent 7386099033b838dee29ac68b2c7813e232629b8a
parent 0783a6d7c9c924b0fabc2daa5bb17047feabd2a3
author Marco Miller <marco.miller@ericsson.com> 1567781455 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567782026 -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: Ia95fcbb8bd52c9e036ff46ddd8e6277c6371b38b