tree 81845bd107d25c70e42ea461e57a68af7d804015
parent 28063e552a1f1dee6a566b6ccaffd27c73866e0c
parent 2adcabf3187c805d604ba4b4c317bd01d99c3d26
author David Pursehouse <dpursehouse@collab.net> 1552547000 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552547000 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I7bcc009cbe16925d74962674489d3b1afc364e57