Merge "Code cleanup"

This commit is contained in:
Romain Guy 2011-12-12 11:44:43 -08:00 committed by Android (Google) Code Review
commit 9e212ebc0f

Diff Content Not Available