tree e2fe85ed366e8dde5338afe4bc82d7c7e276a25f
parent 2c9d976f9e2bea94915d23a6a2e3e48363133bd9
parent e6092a02c3e65130b596ede26a4038c83314bafc
author David Pursehouse <dpursehouse@collab.net> 1524054022 +0200
committer David Pursehouse <dpursehouse@collab.net> 1524054043 +0200

Merge branch 'stable-2.15'

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

Change-Id: I4dd8f54bc953bc00959cb52d0fcfc29506b2f631