tree 4fd1a3bc10f0d3dbd9fbebff548ea5bf5b1992bd
parent 9bf16fbc0e7a8af57a97146684b27243fd39d8df
parent 79b061ae720927fc6ac4f01cd63addad86cc55ea
author David Pursehouse <dpursehouse@collab.net> 1567661842 +0900
committer David Pursehouse <dpursehouse@collab.net> 1567661842 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Use junit_test instead of java_test

Change-Id: I07ea4e715a435ead03c8895cb57db5dfc921bd68