tree 001bcdb413dea7693e79ef3b19271679153adff4
parent e75191edf074e0e1369caa9b2e06d0ddbad0eb04
parent ce6d1d90324c066c94c2f1c127fd3c864e03e45b
author David Pursehouse <dpursehouse@collab.net> 1567661805 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661805 +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: Ic537d1b9f7883ff3fc64022b4dc135c9d7f87f7c