tree d40048348c86ec3320b98a049015773b332e4119
parent 86f266667a1e9921510a47836d6d6fd548be682f
parent 7530df88adaea975387a0a5718a6a86cef3b167d
author David Pursehouse <dpursehouse@collab.net> 1567661799 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661799 +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: I35821b699421aca87477608421942dbbe1d66b3c