tree 3471873b47b823f7bf4bde5dd4e3f653ffd777b6
parent 95579c43fd9a415ac172ad9e314b2d97872070b9
parent a3aff0ac97b14263e058c5e4028cc7a8b5a27104
author David Pursehouse <dpursehouse@collab.net> 1524140714 +0200
committer David Pursehouse <dpursehouse@collab.net> 1524140714 +0200

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Format Java files with google-java-format 1.5

Change-Id: I806d4672985b4f79e0e46d92cb095c06ccc0600a