tree d1790eddf2568adc600fb63bd2595fdc214f317d
parent 9616a47595fb580aaeb02801afc667e83b38dfb1
parent 7ebd341a4c052dc959572f9f70a503f231ab8b9d
author David Pursehouse <dpursehouse@collab.net> 1567661793 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661793 +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: Ia971a2b3884f1d63327c4511d482ec3e861e4f52