tree 8abbc9a0f3b369fad5e1d181b8a82614bf310659
parent e1576cb670f27e197f9a0786897d0e9d1816469f
author Shih-wei Liao <sliao@google.com> 1299847376 -0800
committer Shih-wei Liao <sliao@google.com> 1299847376 -0800

Clean up, plus davidxli's fix in Line 425.

Change-Id: I899156bafa365a870af324c6f93beac8ebe6f849