tree 5bb337c0a933c32236e16efe68eb128289a4a4f5
parent 7ade66848c856ce678ce322fab477911d01e936c
parent 91204f5889c90c65d9d965201a9d78fd443ec578
author David Pursehouse <dpursehouse@collab.net> 1552547004 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547004 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ie7e2933381eb24048124924b0eea73f7fe70cdd4