Merge "Fix issues #3257701 and #3267312"

This commit is contained in:
Dianne Hackborn 2010-12-08 15:49:04 -08:00 committed by Android (Google) Code Review
commit 9d905ed26f

Diff Content Not Available