tree ed94840c2c5dd194095ad99551bb0ca63a0628ef
parent 8fb8b395b1a477119b7f2720bb436b132bd41216
parent be65089e30a1835d8596a30b5bcbd784bf6385e1
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: Id207619047ce3676be7c1482aebe69d59a589e1f