tree ee606db646e7582623cd2b0132ab769225d97706
parent b2308ad57f145ab6da032383a852cf7a5cef70f6
parent 4d0f196436d96db7cb155373ed861e6161df72a4
author David Pursehouse <dpursehouse@collab.net> 1567661798 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661798 +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: I4592079882b1f71d90f85d05a32f777971afaa46