tree de52faace6cfd86f907688ba09e4af40a9190736
parent 17f5d016b8c9e76cdbf467a004ba22d4c46311fa
parent ae9a9ab370d8026ad809a73b4dae3fb7d79ad8a4
author David Pursehouse <dpursehouse@collab.net> 1552524512 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552524512 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Format with google-java-format 1.7

Change-Id: I0c52d63a7dde2cee35b1fffba35d56b2f613ed9e