tree 5682acd066a40cd3f41d8dd90e7fb9ce765ac0d4
parent 820238b36a930d280aa2b687050a6a31c161cb4c
parent cf249e606510c949c10151906b5ea8c0d6138919
author Marco Miller <marco.miller@ericsson.com> 1567712180 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712359 -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: If8e022e70be8942aa8c90b39c6fef790df1378e2