tree 2c7ca554be864c12b9b3e6ab4bf8100cdbe2de37
parent ff48ba1c503ec38a237b4a69d7f115e24e54a943
parent e78f569acf7c3cb75d543940bc78074a0b477dce
author Marco Miller <marco.miller@ericsson.com> 1567712232 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712452 -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: Ibd60f937732f2010a6db12295188ced6a3459125