Merge "Some cruft removal."

This commit is contained in:
Dianne Hackborn 2012-02-10 11:14:39 -08:00 committed by Android (Google) Code Review
commit db8f43a7f1

Diff Content Not Available