Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge from open-source master | The Android Open Source Project | 2010-04-28 | 4 | -44/+48 |
|\ | | | | | | | Change-Id: I8d2072f805d76c51824b65447def412d21ca99ca | ||||
| * | Update skia/emoji license notices for better accuracy | The Android Open Source Project | 2010-04-28 | 4 | -44/+48 |
| | | | | | | | | Change-Id: I1e93e5d5d0f1c859819f3a84566647fd736e5fb5 | ||||
* | | Enable EmojiFont to return converter name for Shift_JIS. | Daisuke Miyakawa | 2010-03-23 | 2 | -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,142750 | Mike Reed | 2009-03-25 | 2 | -9/+17 |
| | |||||
* | auto import from //branches/cupcake_rel/...@140373 | The Android Open Source Project | 2009-03-18 | 5 | -0/+1325 |