tree 1c7885eb861a588d90ca8fce071ba4fbc02ed88f
parent ee7ca44c21212f899b8c3a74f65c6471b24d0937
parent d1310aa45090eabb8f1d8f26a3c5bfd1266eb565
author David Pursehouse <dpursehouse@collab.net> 1529315984 +0900
committer David Pursehouse <dpursehouse@collab.net> 1529315984 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I9d90551cb226ed638522f63bb64027363e3872bc