tree 43b92335cbeb32ecb92c70466f5bcec7bb7bd061
parent 763770074f3930d9574e83914e3d459226a0f295
parent a8f47b5c51681e34303a38790448eb7d15f9501d
author Marco Miller <marco.miller@ericsson.com> 1579898615 -0500
committer Marco Miller <marco.miller@ericsson.com> 1579898615 -0500

Merge branch 'stable-3.1'

* stable-3.1:
  Bazel: Don't shade bouncycastle in gerrit-plugin-api artifact

Change-Id: If396159b2b7b1134fc9948560dca8f9b6cf53b8f