tree 2e2ddfab166bb73603577ef0b1f0dcc791e4943c
parent e22473affa292030c9b4628c7d0b3b08e3c92b8d
parent db1c20077ac713d60897a969611a10c798bb6ad2
author David Pursehouse <dpursehouse@collab.net> 1567661801 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661801 +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: I2a5a0a197de767a193ad78eedbaa01bf0a657ef8