tree 766e81039992fd03da48f848641507df23b106bd
parent 507db99cc3c40c69340daec85325954cf4b1d799
parent f4d21f409fd2197517d842069dceded673095bcd
author David Pursehouse <dpursehouse@collab.net> 1529237368 +0900
committer David Pursehouse <dpursehouse@collab.net> 1529237368 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I900a7fb00f0e82a297bb051f26671b7efaab4af5