tree 9e95c5b5dedf3187cc312de17ec2ae4a60d891c7
parent e48fc7dd09b6752b632f8c5f2036f835a2ccd429
parent 623aabf4bf35cf7c45c3f3d7da2b96c273b647f3
author Marco Miller <marco.miller@ericsson.com> 1567781440 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567781907 -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: I162822d92d3f608baee16fb1274d7f9ef4a8ba34