tree 0258213a2163121967b21345746d8c0a4ae275df
parent e661a4c330dcc0ca9734df2ec5fb9a467592c04e
parent b5f6e9e6b8addbfbbad235251a145ccf1e745efe
author Marco Miller <marco.miller@ericsson.com> 1567781414 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567781864 -0400

Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I0d9fa6722b78a1c8257e655cbcccfe4bec8aefb4