Merge commit '94ef49918240cedaa559ad7f7752d20cf4d1668b' into eclair-plus-aosp * commit '94ef49918240cedaa559ad7f7752d20cf4d1668b': Fix typo
Merge commit '94ef49918240cedaa559ad7f7752d20cf4d1668b' into eclair-plus-aosp * commit '94ef49918240cedaa559ad7f7752d20cf4d1668b': Fix typo