tree ab9a883d3acb67dbf7beeba828f8d2fe51e475bb
parent 17c37bab1d48a30424d27a1e4731e49c75d534e2
parent 28775c2ed4aea66c3647e259f4b1edb199ecb6cf
author David Pursehouse <dpursehouse@collab.net> 1552550200 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552550200 +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
  Update bazlets to fix build with bazel 0.23

Change-Id: I3c7cfa39367c113e71ef8356097583e88b2cb7ce