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 05:12:23.949000000

Uploaded patch set 3.

-------------------------------------
author: Andreas Short
date: 2012-08-19 05:22:13.249000000

Patch Set 3: Verified; Looks good to me, approved

Self approving mostly whitespace changes with some other checkstyle guidelines changes.

-------------------------------------
author: Andreas Short
date: 2012-08-19 05:22:13.564000000

Change has been successfully cherry-picked as 66115cef4542ece437229f90a0ba17ea96aac69e.

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