tree 14aa1ab72bcc7a24b85a8ceee263d28efc49df25
parent b09fed2d21364d4fe69ebb41d3c543052c2a9b07
parent 76515aa3786f8fcce32ab54b0d863821d1b9520c
author David Pursehouse <dpursehouse@collab.net> 1567661796 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661796 +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: I07898563d4a40d027fb22f6e241491c0b77f6152