tree 2d648e043f4abe875b2db7cf72979816a0a7d478
parent a4b8fa769a072b005fba07520215a3565b1a07ec
parent 3efa1058b214469c3c612cd38909d453aa7e8af9
author David Pursehouse <dpursehouse@collab.net> 1552464264 +0900
committer David Pursehouse <dpursehouse@collab.net> 1552464405 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I08bad33a69e8425b699608a06b71ed767f061afd