tree 528e9e8ac56d15fa79775f2a01c41b9b982a6ddf
parent 820fc5a86b4b47f607da61761a0191e65e10da7c
parent 2529ab0c9b4a221bb71782d3a1d8bf45bde5931b
author David Pursehouse <dpursehouse@collab.net> 1552549781 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552549781 +0900

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I497a88c25811398a169a7f7373a3db65ef66a97c