4ee476ef94
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp * commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7': Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.