Merge "Fix build warnings"

This commit is contained in:
Glenn Kasten 2012-01-11 13:42:47 -08:00 committed by Android (Google) Code Review
commit 19f2cfe3ad

Diff Content Not Available