tree 21d66db751f0d420a1ac84477397d9efe96bd091
parent 57bdc1aedc908d6af938c5cd8d952777fc088d7a
parent e6b987bbe900328246b04db707c1d903dd86af07
author David Pursehouse <dpursehouse@collab.net> 1567661791 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661791 +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: I0d610d640ba83afe551e3947a65ca5b994f60948