tree 28e90c21c71317de98f50db1ce501e674cc7dc8c
parent 3b9ef9301652fd0085cbd0f590ef58124030d1fa
parent 66eb14e1fbff49fc8a520364c3b7d641e786eeb1
author Marco Miller <marco.miller@ericsson.com> 1589389656 -0400
committer Marco Miller <marco.miller@ericsson.com> 1589389656 -0400

Merge branch 'stable-3.1'

* stable-3.1:
  Format Java files with google-java-format

Change-Id: Ic3086f794b705892bf8a33dc0319aa7e0a96656d