tree d6f48a713f786ba2a26e95a8f20f185308788827
parent bc93ad2f58b1b09e6eca2a980bc1d280e2808d40
parent 2e566e861ad6f4b08bb80a214466e87b8f1948ee
author David Pursehouse <dpursehouse@collab.net> 1567661795 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661795 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I28d20c332cc620ce04729bb1defcf34c8fe3a568