tree e5d7bf83c70e7e3767f10e9c16bc5edddd6c5533
parent f97b7314570caf7739810961e307dc9aaa9c52f6
parent 8508358a401b6464a3b54d4275e55a54170ccb23
author Hugo Arès <hugo.ares@ericsson.com> 1529323518 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1529323518 -0400

Merge branch 'stable-2.15'

* stable-2.15:
  Format Java files with google-java-format 1.6

Change-Id: I03b9e1d0d78b56dc000273af7830bd482468adf4