Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp * commit '9a212adcffbc4b32d51f512889b33ba584647aa9': Fix 2641875
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp * commit '9a212adcffbc4b32d51f512889b33ba584647aa9': Fix 2641875