tree 5019bbe03e187b89db41d575c1a495b30d225618
parent c5eba8a13f7c9c3582b5b6ea47ff8c5b6e1adc21
parent 218af46d153dbea58cdb9506a0d278eed9da2e88
author David Pursehouse <dpursehouse@collab.net> 1567661803 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661803 +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: I1754037a406726e35ffa860fb2e7a0a41ddac92d