tree e825f762dc4fcd48441502d83e67a92e38766c74
parent af7e75512eba16d5036a78e2eb685b5e2173b5e0
parent 6a0dd0d2575483d5b19a3fd64bdb1ab6821ab998
author David Pursehouse <dpursehouse@collab.net> 1552547006 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547006 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I059015d0a23d4dc263dad00eb9312bc6834ec4cd