tree fe099a465a92f6ae30156703d13cfa9c564c454f
parent fed5a852ffc4e21df6673715ac8febb52dd578d8
parent 70c569da872934815f43cb16db8286d14b6b2dfa
author David Pursehouse <dpursehouse@collab.net> 1552521719 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552522110 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade google-java-format to 1.7

Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a