tree 32ba2945c88dee9986a94ebd42e8c0d07c0ec4e2
parent 0527621f986a3d171e6cfbdd9f10fccc23d38bf8
parent c0dc79f68c5f88c4bfb00384e46c55ed4e9cb62d
author David Pursehouse <dpursehouse@collab.net> 1552547002 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547002 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Idf098720a9c39353cb411fa53b7c40760cc3b71b