aboutsummaryrefslogtreecommitdiffstats
path: root/emoji
Commit message (Collapse)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-04-284-44/+48
|\ | | | | | | Change-Id: I8d2072f805d76c51824b65447def412d21ca99ca
| * Update skia/emoji license notices for better accuracyThe Android Open Source Project2010-04-284-44/+48
| | | | | | | | Change-Id: I1e93e5d5d0f1c859819f3a84566647fd736e5fb5
* | Enable EmojiFont to return converter name for Shift_JIS.Daisuke Miyakawa2010-03-232-4/+23
|/ | | | | | | | This function will be used in WebKit (ucnv.cpp), which currently embeds the string "docomo-emoji", which is not flexible. Bug: 2327318 Change-Id: Iccbef2882ad931bde9b3ddefe34e81646e5b0686
* Automated import from //branches/master/...@142750,142750Mike Reed2009-03-252-9/+17
|
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-185-0/+1325