Merge "Code cleanup."

This commit is contained in:
Romain Guy 2011-05-19 16:16:43 -07:00 committed by Android (Google) Code Review
commit 26f146f6fe

Diff Content Not Available