tree 6db66b79dfab89607705b7a5c766a3d58b2f56b1
parent e627a75974f7d786d7f5f28909e535c09f6cc8b1
parent 5e332efd56ffc8bcc6c40b214aca66bec21648b7
author Daisuke Miyakawa <dmiyakawa@google.com> 1258701572 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258701572 -0800

am 5e332efd: Merge change I903ce7b1 into eclair-mr2

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.