tree 1dc643c23bd749d384ea70bbeca81d66d6efc3cc
parent 70f2dd685f8e0a41df8ce40be13c247a8f84673e
parent 6dbf8382d83aa479cce748097f788d1edbcdc1bb
author David Pursehouse <dpursehouse@collab.net> 1552550235 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552550235 +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
  Upgrade bazlets to latest stable-2.14
  Update bazlets to fix build with bazel 0.23

Change-Id: I3aecd098c949e155029277b51c9f9553984aee70