tree 3c23ded4ff8cd91b00ec98ddc9efe8fcec3985b5
parent 0da9546e6d410403ce1551c87f2cb431185003d2
parent 76a68cfb870fb09966950109f2db8485821c63dc
author Marco Miller <marco.miller@ericsson.com> 1589555870 -0400
committer Marco Miller <marco.miller@ericsson.com> 1589555870 -0400

Merge branch 'stable-3.1'

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

Change-Id: Ib767171ce771e5963ec853a8302f64bdea504310