tree a98a3ee4cb6188ce678e7a3c5fe471e320a98069
parent 75139ca5e6e8097349f5540de4a61ca637f99c35
parent 63742c86f18380a988fd7799992fe1bb05e763eb
author David Pursehouse <dpursehouse@collab.net> 1552547007 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547007 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ifb680c49fc3f453ce9956312439ab3dc3dcc4a40