tree 31aa977feb0787d48610f936e49b92d0d4319582
parent ab6c03eda7730ebf7361968c2a6ecd0310371a42
parent 27cfe38a62b73db44083ff9972649becff13a224
author Marco Miller <marco.miller@ericsson.com> 1567712242 -0400
committer Marco Miller <marco.miller@ericsson.com> 1567712468 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Remove unnecessary 'include =' on java_library src parameter

Change-Id: I478a2a8e818f68561d6c0be3bbab7b5f918c6b59