tree 1896f281b73417047e893be82fdfa32b06f5bf8a
parent 3dfbac2c386452944cfd122833c48c4e4b91394f
parent e9420bc8766f0306161d830a0cd9b53a997f8c2e
author David Pursehouse <dpursehouse@collab.net> 1567661792 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661792 +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: I7afb6882dcd72f679239d87c75a9333f83488745