tree 973599eff7fa9dc972d25bb1e6bd7c058c9b698d
parent 8d1863a3749d433c2ebf9c3b465fc3b3228b60ac
parent 4daf25a3d30efdf5465006d7357facc4e2ebf790
author Marco Miller <marco.miller@ericsson.com> 1595257973 -0400
committer Marco Miller <marco.miller@ericsson.com> 1595257998 -0400

Merge branch 'stable-3.2'

* stable-3.2:
  Disable DoNotMock Error Prone check
  Revert "Reformat Comment to HumanComment"
  Bump Bazel version to 3.4.1
  e2e-tests: Replace hardcoded scheme with property

The aforementioned revert is undone, as that commit did apply to master.

Change-Id: Iefd8d05b3d8e6bf50cc7a7a663be0eb83378785a