| commit | 3dc3d948d1e10b46e2b6d53402f2385ce4763996 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 14:46:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 14:46:07 2012 -0700 |
| tree | b07d719567df891c0028bf899982f624a8022dd5 | |
| parent | a9e2014ea5bbbd291ab6634a497038d30df57d0a [diff] | |
| parent | e5a09b0f6e740feff34dcf0ec347c7721e9701c3 [diff] |
am e5a09b0f: am 9bc20fb9: resolved conflicts for merge of 3646b108 to jb-mr1-dev * commit 'e5a09b0f6e740feff34dcf0ec347c7721e9701c3': Sync HanziToPinyin tables with ICU 4.6.