aboutsummaryrefslogtreecommitdiffstats
path: root/emoji
Commit message (Expand)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-04-284-44/+48
|\
| * Update skia/emoji license notices for better accuracyThe Android Open Source Project2010-04-284-44/+48
* | Enable EmojiFont to return converter name for Shift_JIS.Daisuke Miyakawa2010-03-232-4/+23
|/
* 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