aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 73ca0f2c: am 423921ca: Merge "Fallback on empty locales."Jean Chalard2013-10-091-2/+18
|\ | | | | | | | | * commit '73ca0f2cec62cc67eceb526cd28d48948eae5b45': Fallback on empty locales.
| * am 423921ca: Merge "Fallback on empty locales."Jean Chalard2013-10-041-2/+18
| |\ | | | | | | | | | | | | * commit '423921ca131dd1f330599063d34acd714889edf1': Fallback on empty locales.
| | * Merge "Fallback on empty locales."Jean Chalard2013-10-041-2/+18
| | |\
| | | * Fallback on empty locales.Jean Chalard2013-10-041-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very rare corner case. Bug: 11072132 Change-Id: Iad2aa69511f7dc99105284a049c63f2f997b8ef0
* | | | am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji."Jean Chalard2013-10-091-6/+17
|\| | | | | | | | | | | | | | | | | | | * commit 'c5f7d74b2bb83e99bef7aad62924b0c043ce8961': Accept double-space-period after emoji.
| * | | am 5db7eaba: Merge "Accept double-space-period after emoji."Jean Chalard2013-10-041-6/+17
| |\| | | | | | | | | | | | | | | | | | * commit '5db7eabafb75a595403309b74c86cba5d4d5486f': Accept double-space-period after emoji.
| | * | Merge "Accept double-space-period after emoji."Jean Chalard2013-10-041-6/+17
| | |\ \
| | | * | Accept double-space-period after emoji.Jean Chalard2013-10-041-6/+17
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also includes a fix that allows this code to read surrogate pairs in this processing. Bug: 11070482 Change-Id: If5ef8d6863938252f09128b7e99ea07ece6e7019
* | | | am 3bf2c598: am 1d188a28: Merge "Fix emoji"Satoshi Kataoka2013-10-097-7/+7
|\| | | | | | | | | | | | | | | | | | | * commit '3bf2c59881ebdd4cf77099806d26f280046623bf': Fix emoji
| * | | am 1d188a28: Merge "Fix emoji"Satoshi Kataoka2013-10-047-7/+7
| |\| | | | | | | | | | | | | | | | | | * commit '1d188a28fb0930217098fef10937674e24ca5a49': Fix emoji
| | * | Merge "Fix emoji"Satoshi Kataoka2013-10-047-7/+7
| | |\ \
| | | * | Fix emojiSatoshi Kataoka2013-10-047-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
* | | | | am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior"Satoshi Kataoka2013-10-092-3/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '664f11f2ffee2cfefe12a98bde79673abf909148': Fix emoji recent key behavior
| * | | | am 0b288985: Merge "Fix emoji recent key behavior"Satoshi Kataoka2013-10-042-3/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0b288985b7e6a74f94943f15be6d6d55d6cca872': Fix emoji recent key behavior
| | * | | Merge "Fix emoji recent key behavior"Satoshi Kataoka2013-10-042-3/+38
| | |\ \ \
| | | * | | Fix emoji recent key behaviorSatoshi Kataoka2013-10-042-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: I91e03a8e7914628cdc8e57c124c95e5e6e8ea2a6
* | | | | | am f330de95: am c01707db: Merge "Suppress exceptions that have always been ↵Ken Wakasa2013-10-092-7/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | happening." * commit 'f330de9526025448e64bdfe69b3d277e214c2512': Suppress exceptions that have always been happening.
| * | | | | am c01707db: Merge "Suppress exceptions that have always been happening."Ken Wakasa2013-10-042-7/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c01707db03c124ecab0c8ba14b4e4f2d24c973c9': Suppress exceptions that have always been happening.
| | * | | | Merge "Suppress exceptions that have always been happening."Ken Wakasa2013-10-042-7/+12
| | |\ \ \ \
| | | * | | | Suppress exceptions that have always been happening.Ken Wakasa2013-10-042-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
* | | | | | | am e6a64022: am 676bb517: Merge "Add Ver4DictUpdater."Ken Wakasa2013-10-093-2/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6a6402258a9dae8b71be7af94d682ebb775b28f': Add Ver4DictUpdater.
| * | | | | | am 676bb517: Merge "Add Ver4DictUpdater."Ken Wakasa2013-10-043-2/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '676bb517ed7cf137c084a861ab0c2a88dd7a6452': Add Ver4DictUpdater.
| | * | | | | Merge "Add Ver4DictUpdater."Ken Wakasa2013-10-043-2/+61
| | |\ \ \ \ \
| | | * | | | | Add Ver4DictUpdater.Yuichiro Hanada2013-10-043-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I986ab26faf535fc4bc98443053f534eced9d048f
* | | | | | | | am d5c90d9d: am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."Ken Wakasa2013-10-091-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5c90d9d8be05d848661aba10d11bac14cf70626': Refactor BinaryDictIOUtilsTests.
| * | | | | | | am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."Ken Wakasa2013-10-041-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '618158e675c27854b0ab2cb53ec2eb2837a593c0': Refactor BinaryDictIOUtilsTests.
| | * | | | | | Merge "Refactor BinaryDictIOUtilsTests."Ken Wakasa2013-10-041-0/+4
| | |\| | | | | | | | |/ / / / | | |/| | | |
| | | * | | | Refactor BinaryDictIOUtilsTests.Yuichiro Hanada2013-10-041-0/+4
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Change-Id: I2208378b33038771b460abb33f9a690872e998e2
* | | | | | am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets"Satoshi Kataoka2013-10-094-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3944a67c325478341be43a97017db0c50746c17c': Tentatively revert assets
| * | | | | am 6ec0cf12: Merge "Tentatively revert assets"Satoshi Kataoka2013-10-044-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44': Tentatively revert assets
| | * | | | Merge "Tentatively revert assets"Satoshi Kataoka2013-10-044-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * / Tentatively revert assetsSatoshi Kataoka2013-10-044-0/+0
| | | |/ | | | | | | | | | | | | Change-Id: I403fc24a407fdd3b433d5820f1b46e6985cbe83e
* | | | am 10100b2c: am 14d31d46: Add AbstractDictDecoder.Yuichiro Hanada2013-10-095-186/+226
|\| | | | | | | | | | | | | | | | | | | * commit '10100b2c52fd6073b37eb3d8558439e62c6c9412': Add AbstractDictDecoder.
| * | | am 14d31d46: Add AbstractDictDecoder.Yuichiro Hanada2013-10-035-186/+226
| |\| | | | | | | | | | | | | | | | | | * commit '14d31d464037c31e7f7d382a8a86f6acf4694b06': Add AbstractDictDecoder.
| | * | Add AbstractDictDecoder.Yuichiro Hanada2013-10-045-186/+226
| | | | | | | | | | | | | | | | Change-Id: Ie69d84e090f69dc3ea1f5de73ad8c954ecd2c6a7
* | | | am 73ddd404: am 78409cd9: Merge "Separate shortcut targets from the trie file."Ken Wakasa2013-10-095-37/+107
|\| | | | | | | | | | | | | | | | | | | * commit '73ddd4041967babdcb201da33042e15460031faf': Separate shortcut targets from the trie file.
| * | | am 78409cd9: Merge "Separate shortcut targets from the trie file."Ken Wakasa2013-10-035-37/+107
| |\| | | | | | | | | | | | | | | | | | * commit '78409cd9409f5d5bc706718a5a50963596810716': Separate shortcut targets from the trie file.
| | * | Merge "Separate shortcut targets from the trie file."Ken Wakasa2013-10-045-37/+107
| | |\ \ | | | |/ | | |/|
| | | * Separate shortcut targets from the trie file.Yuichiro Hanada2013-10-045-37/+107
| | | | | | | | | | | | | | | | | | | | Bug: 10920165 Change-Id: I340759eadbde7fb64cb3b9a3c619ee3a768cedf8
| * | | am ef64676b: Merge "Revert emoji key position to JB-mr2"Satoshi Kataoka2013-10-034-4/+26
| |\| | | | | | | | | | | | | | | | | | * commit 'ef64676bf8e843e0f5c3b8ed1ad409219da3493a': Revert emoji key position to JB-mr2
| | * | Merge "Revert emoji key position to JB-mr2"Satoshi Kataoka2013-10-044-4/+26
| | |\ \ | | | |/ | | |/|
| | | * Revert emoji key position to JB-mr2Satoshi Kataoka2013-10-044-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: Ie2033b2f5253b2e2fc2229ba6c95568e7b2a58fa
* | | | am f6c2a0fe: am afa56511: Merge "Update string comments for translation"Alan Viverette2013-10-091-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'f6c2a0fe59444eb85a7e658ce36bf40edd8605da': Update string comments for translation
| * | | am afa56511: Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
| |\| | | | | | | | | | | | | | | | | | * commit 'afa565119cd3e8fd7f92ee22033932fc8e8d47d4': Update string comments for translation
| | * | Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
| | |\ \
| | | * | Update string comments for translationAlan Viverette2013-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: 11042719,11021829 Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
* | | | | am f28ca53b: am 864ee881: Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-092-6/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f28ca53b33098a87938fc9eafff5577e6c02a822': Fix UserHistoryDictionaryTests.
| * | | | am 864ee881: Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-032-6/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '864ee881bd2f4a5dbde8f31c68e7f89522c67db6': Fix UserHistoryDictionaryTests.
| | * | | Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-032-6/+25
| | |\ \ \
| | | * | | Fix UserHistoryDictionaryTests.Keisuke Kuroyanagi2013-10-032-6/+25
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Bug: 10667710 Change-Id: I6cdc6a6c9cacc7f276fda3a26ec31e3eb928471c