tree d1d7b401e74dc3cd76499b4a716792e4d2e39ac7
parent 70c5e56b231a38176ad7556402390ef462e4e6b0
parent e463d69257a814e0ea19d4a7fe7c0779c0371bcf
author David Pursehouse <dpursehouse@collab.net> 1567661804 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661804 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Iaf3ef7bf348175629be9b9f2c94227db98e559a0