cherry-pick db00a226071878ae9bd821d28903dca8f6071140 to froyo.

Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
1 file changed