Merge "A few small cleanning-ups." into honeycomb

This commit is contained in:
Huahui Wu 2011-01-24 13:25:17 -08:00 committed by Android (Google) Code Review
commit ac74723924

Diff Content Not Available