tree 938c6d751ce7eb694b579503779bc2fa9cb54fab
parent 45003c4e290cd29a8695db438ca30302fa0683c7
parent 578bc671ec38eba7c2aab38644fd1c4deacad4dd
author David Pursehouse <dpursehouse@collab.net> 1528251616 +0900
committer David Pursehouse <dpursehouse@collab.net> 1528251616 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  SingleUserGroupTest: Reformat with google-java-format 1.6

Change-Id: I097cc10a5b53135dbb0acf4dab5e78bf333cef22