tree 24702c648d85c0ebd0c682d4e2368f0e70b1497e
parent 43843345eedcbab573e729dee30d0bd0044c0762
parent e810e78a7fb09d55389b3dde4e0b2e0ca1609e57
author David Pursehouse <dpursehouse@collab.net> 1567661789 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661789 +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: Ib9e3242c294372673439de2ecc82a9eb8ae6281d