Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread"

This commit is contained in:
Gilles Debunne 2010-11-15 15:23:01 -08:00 committed by Android (Google) Code Review
commit 20c87e3090

Diff Content Not Available