tree 2897d0b389f7374476f8449b32d4b5e2312e5623
parent e74f64c6049ffc1b1533724061a7de79d4da4565
parent 79aee9b2e8182679775bc91bf667399a0f94a7d0
author David Pursehouse <dpursehouse@collab.net> 1567661786 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661786 +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: I920ed0e4f6eba4cc45ee696a338a91c37f2f03a1