tree 7e8683918c77c9123afe84245e2a56980004fa31
parent a15d2b868c0bbe8655af68553d727c58435acb81
parent 16a23452982b9cdd4c9195c45db90afd8641779d
author David Pursehouse <dpursehouse@collab.net> 1567661790 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661790 +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: Iab1085ed238a355b1fc8560fcd53093a053957e2