tree d0ed88fb3269aabecbd6c1b9d4840be276fa86ca
parent 1c9c02d0cded5c999707210c8268bb199212edbc
parent 563e8a734b90ce9e70afd36826f4a5a5961ff57a
author Marco Miller <marco.miller@ericsson.com> 1567712194 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712389 -0400

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ica978c1a7144dfc11329fb5c3cd7ba3447155f87