tree b687b0e82c5477071d0ac68b6ca512bbe255da8e
parent 22495f7aaa9f91b55c0482cefe27bb117d1869c9
parent bcfb05cbd1200422b81e9ac2ce824868ff74f252
author David Pursehouse <dpursehouse@collab.net> 1552521448 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552521448 +0900

Merge branch 'stable-2.15'

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

Change-Id: Id8d61153874989dcad7e0b2deeaaf191ff2e183e