tree a10736478ff9db771dd8a5d4952a8c7fd28ed8bc
parent 3646b1085f422e5c7967af2c2ba30b76d80fa14f
parent 7d112d54a173e6d6172aeeff5fa7dfee4abc2d73
author Makoto Onuki <omakoto@google.com> 1345842576 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345842576 -0700

am 7d112d54: Merge "Update HanziToPinyin table and tests."

* commit '7d112d54a173e6d6172aeeff5fa7dfee4abc2d73':
  Update HanziToPinyin table and tests.