tree b21448084937a3b8f6c923120db62cdd6fa272c6
parent 60f470c96232d44c5fd83c75ac99174b356adcf5
parent 89c45893a3b0ea228380f35946070a9e0ad8c8fc
author David Pursehouse <dpursehouse@collab.net> 1567576510 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567576510 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ib3eb76f059d398f2837b1b55e22d11953d2860af