tree 2744f66af29f942a0abe540db292d4c8624260df
parent db15acbf1852c7c84af88ebb11f7e6e515eb6fbe
parent 9dfb17e0caa764583117eca0698cad557092b9b7
author David Pursehouse <dpursehouse@collab.net> 1552550224 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552550224 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Format Java files with google-java-format 1.7
  Upgrade mockito-core to 2.25.0
  Upgrade bazlets to latest stable-2.15
  Align Eclipse compiler settings with core Gerrit's
  Upgrade bazlets to latest stable-2.14
  Update bazlets to fix build with bazel 0.23

Change-Id: I31f4510dd1b66bf2cc1e71f2593a8cacc45ca19e