tree 8d71a67d864ff7296002f25e693a939857f20406
parent 2714c2c54f8717093fb4b081aced0e4611eb8abc
parent f4537b10ba4227a9571f7d027e207e418f8f3372
author Marco Miller <marco.miller@ericsson.com> 1567712225 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712441 -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: I64fe4e9caf2df795782bfc637e55f2c17efca1c4