DESCRIPTION

Checkstyle fixes from merge commit.

Initially, I tried to rebase this to be the first commit after
the merge, but git would keep losing it even when using -p during
rebase.

Change-Id: If9c79e0139ab60261e67195037686de3a446a373


COMMENTS

author: Andreas Short
date: 2012-08-19 00:57:03.283000000

Uploaded patch set 2.

-------------------------------------
