Merge commit '7478ea6848c0059e65a4089b4ec2ff4158520870' into eclair-plus-aosp * commit '7478ea6848c0059e65a4089b4ec2ff4158520870': Remove trailing spaces.
Merge commit '7478ea6848c0059e65a4089b4ec2ff4158520870' into eclair-plus-aosp * commit '7478ea6848c0059e65a4089b4ec2ff4158520870': Remove trailing spaces.