tree e4230a4c0b4c7cff15b8d18adddeecdf0f443eb4
parent 1ff2b96fb5fe37aedcb19f63eae1ab1dd9503d76
parent 72729942129ab451e11a4d8330030d05cf35feff
author David Pursehouse <dpursehouse@collab.net> 1552549983 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552550033 +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: I1c330230375ca0a257fa718fc2e31ddb8bc941ef