Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp * commit '8f655cb6c836380778545fb13044d97ef57139d6': Update the comment which supposed to be checked in
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp * commit '8f655cb6c836380778545fb13044d97ef57139d6': Update the comment which supposed to be checked in