Merge "Code cleanup"

This commit is contained in:
Romain Guy 2011-06-24 13:21:30 -07:00 committed by Android (Google) Code Review
commit 6088451c17

Diff Content Not Available