tree 1c9d0fd1eb80e84892bbcfbb873873594ea6fab3
parent 24655e2c9578b1ddcc73718c95a01d8690c274f8
parent 9901484231f3b8067971ea6748c88b71f82d6c50
author David Pursehouse <dpursehouse@collab.net> 1567661797 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661797 +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: I4658c8ab2f4a253378841baa7be6d69c09793d05