Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"