tree 01a6c7058638992577f2e9ca043c5cdff2372812
parent 98e25a0b5e5ca41f051265b0316f4b48c1565d37
parent 3b1b1d5e732728ea7d60b408ab03f42e5d9ace8f
author Makoto Onuki <omakoto@google.com> 1345842725 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345842725 -0700

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

* commit '3b1b1d5e732728ea7d60b408ab03f42e5d9ace8f':
  Update HanziToPinyin table and tests.