tree 028c614ef0848ecbe72ef742a70e191689a97c0e
parent 790d74419076e6a087a6653070bb1558941fb781
parent cb243def4a3084f5aa23ebd08b40ea189ae0fca2
author Marco Miller <marco.miller@ericsson.com> 1589389653 -0400
committer Marco Miller <marco.miller@ericsson.com> 1589389653 -0400

Merge branch 'stable-3.1'

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

Change-Id: Iab94ce322b89b8d52d9b914c8b33fbc4c2668224