tree b0f84df87890a3293d42b8d913f738aac842c902
parent 51180063f6ce484c78aa34f46934d483a71f24fe
parent 7a4c55705966284c6f6caf447c642bd64a01c474
author David Pursehouse <dpursehouse@collab.net> 1567661800 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661800 +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: I5da604fcbf40b30246da3ee45153a4c902464a7e