tree 68e252663ea35a2c12a7f29dab7152a42c931990
parent c7bc3d09bda82c0641035966559b911785ccf90e
author Brad Fitzpatrick <bradfitz@android.com> 1289867164 -0800
committer Brad Fitzpatrick <bradfitz@android.com> 1289867164 -0800

Fix more things that CloseGuard found.

Not terribly happy with how the code looks after, though.

Change-Id: I7bf5f78ef6c0ac82339a2e49488ca6e64d13c05e