am 02b45ce7: am 092cfaaa: Merge "cherry-picked bf4650ca39 to froyo" into froyo
This commit is contained in:
02b45ce7: am 092cfaaa: Merge "cherry-picked bf4650ca39 to froyo" into froyo