Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp * commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d': cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp * commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d': cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo