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