tree a1da4d9f3a950fa325f8b2a981f54266bee9ba2d
parent eca497805790245ab39720c99902c65a90111e2e
parent 7188bed87163e06a23d34466440d3b7f0e4e716f
author Marco Miller <marco.miller@ericsson.com> 1552600397 -0400
committer Marco Miller <marco.miller@ericsson.com> 1552604939 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Format Java files with google-java-format 1.7

Change-Id: I95f59c23338cd452d1e8f0aca5faadeec5a5c6dc