tree e9d1bb34dadc54d5fc95b16a3ba6d44b7299b790
parent 37ffb1426d6dc4329dc72312a748a6e858f6fca9
parent 35eba7c9215b348d3a9ea2ae35aff99974380902
author David Pursehouse <dpursehouse@collab.net> 1552547005 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547005 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Id4510637f3f23014920d5460357d71ad8b8fb7c6