tree 11b64cb726a2197b7c9b66af48ef5a042bb91dea
parent 5de946231d49ceb84f2acf16e0bd04d1b0f2aaca
parent ce268a341233be1b274106d0d1c0308104a6241a
author David Pursehouse <dpursehouse@collab.net> 1552550209 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552550209 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Format 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: Id7e3e089f3e50520a0cbb71a382e31b4efb646ed