tree cc5d671869f694a85c1e5c08a77ccfc1a69d64de
parent dbe2f1d10a1d5e77117d929ea56a28e296bc1b2b
parent 0a830112d4531b06320902fdc210b4fe216a650f
author Marco Miller <marco.miller@ericsson.com> 1553124230 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553124230 -0400

Merge branch 'stable-2.15'

* stable-2.15:
  Upgrade mockito-core to 2.25.1
  Upgrade bazlets to latest stable-2.15 to build with 2.15.12 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.19 API
  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: I2f498e491746c95616fbc00b6b2a9295deaa3f52