tree f4fa07320a3c79a114065c664e4386997d654cfb
parent 951bb2522f56c9acd6be60037160719567f52024
parent 1380e0ab2f398157abe142be2ac4d93c2e8eee86
author David Pursehouse <dpursehouse@collab.net> 1552546998 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552546998 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I659914939518eb24b6e43df846ac27dd08a70d9d