Merge "Simplify code"

This commit is contained in:
Glenn Kasten 2012-02-17 09:40:43 -08:00 committed by Android (Google) Code Review
commit 4ede6e268a

Diff Content Not Available