Baligh Uddin
7b8c9dd0b0
am a8f4efd0
: (-s ours) am 069b185d
: (-s ours) am 0de11871
: (-s ours) am b2ffcd64
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a8f4efd0132592c34ab87b6a3cf6ce1baa0f522d':
Import translations. DO NOT MERGE
2013-10-06 18:23:03 -07:00
Baligh Uddin
a8f4efd013
am 069b185d
: (-s ours) am 0de11871
: (-s ours) am b2ffcd64
: (-s ours) Import translations. DO NOT MERGE
...
* commit '069b185d83ed7ab2c96db03aa8271b4bbf34233a':
Import translations. DO NOT MERGE
2013-10-06 18:19:58 -07:00
Baligh Uddin
069b185d83
am 0de11871
: (-s ours) am b2ffcd64
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0de11871c5569921296a72a56a33bddab1167ed0':
Import translations. DO NOT MERGE
2013-10-06 18:14:51 -07:00
Baligh Uddin
0de11871c5
am b2ffcd64
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b2ffcd6424eaed951302889079773f6a51c9d380':
Import translations. DO NOT MERGE
2013-10-06 18:11:59 -07:00
Baligh Uddin
e9557d4b89
am f645402a
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f645402a0797486004c71dd5677f630dde9b7e11':
Import translations. DO NOT MERGE
2013-10-05 21:20:23 -07:00
Baligh Uddin
f645402a07
Merge "Import translations. DO NOT MERGE"
2013-10-06 02:43:10 +00:00
Baligh Uddin
d7e90dad0e
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-10-06 02:42:46 +00:00
Baligh Uddin
f96391aee0
Import translations. DO NOT MERGE
...
Change-Id: I15036545751abe751f2768daef7f3f1605a5457e
Auto-generated-cl: translation import
2013-10-04 22:59:25 -07:00
Baligh Uddin
b2ffcd6424
Import translations. DO NOT MERGE
...
Change-Id: I6f88694633aa9f39c6b1731ea7634b80d3e3bf69
Auto-generated-cl: translation import
2013-10-04 22:55:10 -07:00
Baligh Uddin
e4343ac686
Import translations. DO NOT MERGE
...
Change-Id: Icb238009beb72e5f4f70ad6e7e2333e26a7b24d5
Auto-generated-cl: translation import
2013-10-04 22:51:01 -07:00
Baligh Uddin
4d4fe3eb5e
Import translations. DO NOT MERGE
...
Change-Id: I04aed3599ff9570197b408a5d16ea48422294f97
Auto-generated-cl: translation import
2013-10-04 22:46:44 -07:00
Qiwen Zhao
e30c888598
am 791a5a6a
: am 06ba3ef1
: (-s ours) am 551a1c24
: reset to klp-dev branch to fix merging problem.
...
* commit '791a5a6a3c8e89fd6c442a8ebac4019ace892276':
2013-10-04 12:59:58 -07:00
Qiwen Zhao
791a5a6a3c
am 06ba3ef1
: (-s ours) am 551a1c24
: reset to klp-dev branch to fix merging problem.
...
* commit '06ba3ef19fba91dcb9071cadc4b4bd4d0b454366':
2013-10-04 12:57:05 -07:00
Qiwen Zhao
06ba3ef19f
am 551a1c24
: reset to klp-dev branch to fix merging problem.
...
* commit '551a1c246ff348353a57ea3be13aa419457923f5':
2013-10-04 12:30:48 -07:00
Satoshi Kataoka
39ccc44b5a
am 6594318e
: (-s ours) am 5ce96037
: (-s ours) am d03f1793
: am f4aa9a7b
: Do not merge. Revert emoji key position to JB-mr2
...
* commit '6594318e7db5998c4be634ca0ec957d4115706d3':
Do not merge. Revert emoji key position to JB-mr2
2013-10-04 12:00:19 -07:00
Satoshi Kataoka
6594318e7d
am 5ce96037
: (-s ours) am d03f1793
: am f4aa9a7b
: Do not merge. Revert emoji key position to JB-mr2
...
* commit '5ce9603784423f6dfa4f0654b0b104591f7ac1ae':
Do not merge. Revert emoji key position to JB-mr2
2013-10-04 11:10:43 -07:00
Qiwen Zhao
551a1c246f
reset to klp-dev branch to fix merging problem.
2013-10-04 11:04:56 -07:00
Baligh Uddin
a9a54bb4cd
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-10-04 16:55:51 +00:00
Baligh Uddin
2b361d95a6
Import translations. DO NOT MERGE
...
Change-Id: I50e530351c75746759fefc4113c4f881755405ec
Auto-generated-cl: translation import
2013-10-04 09:03:13 -07:00
Jean Chalard
73ca0f2cec
am 423921ca
: Merge "Fallback on empty locales."
...
* commit '423921ca131dd1f330599063d34acd714889edf1':
Fallback on empty locales.
2013-10-04 06:47:34 -07:00
Jean Chalard
423921ca13
Merge "Fallback on empty locales."
2013-10-04 13:44:44 +00:00
Jean Chalard
c5f7d74b2b
am 5db7eaba
: Merge "Accept double-space-period after emoji."
...
* commit '5db7eabafb75a595403309b74c86cba5d4d5486f':
Accept double-space-period after emoji.
2013-10-04 06:08:34 -07:00
Jean Chalard
5db7eabafb
Merge "Accept double-space-period after emoji."
2013-10-04 13:05:43 +00:00
Jean Chalard
43a8a0c527
Fallback on empty locales.
...
This is a very rare corner case.
Bug: 11072132
Change-Id: Iad2aa69511f7dc99105284a049c63f2f997b8ef0
2013-10-04 22:04:59 +09:00
Jean Chalard
8142fd83a6
Accept double-space-period after emoji.
...
This also includes a fix that allows this code to read surrogate
pairs in this processing.
Bug: 11070482
Change-Id: If5ef8d6863938252f09128b7e99ea07ece6e7019
2013-10-04 22:01:36 +09:00
Satoshi Kataoka
3bf2c59881
am 1d188a28
: Merge "Fix emoji"
...
* commit '1d188a28fb0930217098fef10937674e24ca5a49':
Fix emoji
2013-10-04 05:02:12 -07:00
Satoshi Kataoka
1d188a28fb
Merge "Fix emoji"
2013-10-04 12:00:39 +00:00
Satoshi Kataoka
0cf92aa826
Fix emoji
...
Bug: 10538430
Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
2013-10-04 20:58:09 +09:00
Satoshi Kataoka
664f11f2ff
am 0b288985
: Merge "Fix emoji recent key behavior"
...
* commit '0b288985b7e6a74f94943f15be6d6d55d6cca872':
Fix emoji recent key behavior
2013-10-04 04:31:32 -07:00
Satoshi Kataoka
0b288985b7
Merge "Fix emoji recent key behavior"
2013-10-04 11:18:07 +00:00
Satoshi Kataoka
e7ed5cae44
Fix emoji recent key behavior
...
Bug: 10538430
Change-Id: I91e03a8e7914628cdc8e57c124c95e5e6e8ea2a6
2013-10-04 20:01:00 +09:00
Ken Wakasa
f330de9526
am c01707db
: Merge "Suppress exceptions that have always been happening."
...
* commit 'c01707db03c124ecab0c8ba14b4e4f2d24c973c9':
Suppress exceptions that have always been happening.
2013-10-04 03:15:40 -07:00
Ken Wakasa
c01707db03
Merge "Suppress exceptions that have always been happening."
2013-10-04 10:13:53 +00:00
Ken Wakasa
fba1bd0ec4
Suppress exceptions that have always been happening.
...
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
2013-10-04 19:10:26 +09:00
Ken Wakasa
e6a6402258
am 676bb517
: Merge "Add Ver4DictUpdater."
...
* commit '676bb517ed7cf137c084a861ab0c2a88dd7a6452':
Add Ver4DictUpdater.
2013-10-04 02:49:55 -07:00
Ken Wakasa
d5c90d9d8b
am 618158e6
: Merge "Refactor BinaryDictIOUtilsTests."
...
* commit '618158e675c27854b0ab2cb53ec2eb2837a593c0':
Refactor BinaryDictIOUtilsTests.
2013-10-04 02:49:52 -07:00
Ken Wakasa
676bb517ed
Merge "Add Ver4DictUpdater."
2013-10-04 09:48:27 +00:00
Ken Wakasa
618158e675
Merge "Refactor BinaryDictIOUtilsTests."
2013-10-04 09:47:35 +00:00
Satoshi Kataoka
3944a67c32
am 6ec0cf12
: Merge "Tentatively revert assets"
...
* commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44':
Tentatively revert assets
2013-10-04 02:18:45 -07:00
Satoshi Kataoka
6ec0cf12b8
Merge "Tentatively revert assets"
2013-10-04 09:17:12 +00:00
Satoshi Kataoka
0b4d75c2fa
Tentatively revert assets
...
Change-Id: I403fc24a407fdd3b433d5820f1b46e6985cbe83e
2013-10-04 18:09:03 +09:00
Keisuke Kuroyanagi
799263c377
am 966af8b5
: Merge "Make BinaryDictionaryTests use current time as a seed."
...
* commit '966af8b5ba540f583ccb5ac0d323dc3dc2e49342':
Make BinaryDictionaryTests use current time as a seed.
2013-10-04 01:40:40 -07:00
Yuichiro Hanada
e4e0add9fb
Add Ver4DictUpdater.
...
Change-Id: I986ab26faf535fc4bc98443053f534eced9d048f
2013-10-04 17:33:29 +09:00
Keisuke Kuroyanagi
966af8b5ba
Merge "Make BinaryDictionaryTests use current time as a seed."
2013-10-04 08:04:05 +00:00
Satoshi Kataoka
5ce9603784
am d03f1793
: am f4aa9a7b
: Do not merge. Revert emoji key position to JB-mr2
...
* commit 'd03f17936b95be7da38c36a65cfc4e62176ef7ed':
Do not merge. Revert emoji key position to JB-mr2
2013-10-04 00:49:34 -07:00
Keisuke Kuroyanagi
bcb196e3b5
Make BinaryDictionaryTests use current time as a seed.
...
Bug: 10197478
Change-Id: Ib79cd3a81b01b16259df29b36e1df6b8f0affca8
2013-10-04 16:48:22 +09:00
Satoshi Kataoka
d03f17936b
am f4aa9a7b
: Do not merge. Revert emoji key position to JB-mr2
...
* commit 'f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e':
Do not merge. Revert emoji key position to JB-mr2
2013-10-04 00:47:41 -07:00
Satoshi Kataoka
f4aa9a7bd7
Do not merge. Revert emoji key position to JB-mr2
...
Cherry pick of Ie2033b2f5253b2e2
Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
2013-10-04 16:38:54 +09:00
Keisuke Kuroyanagi
5544b966e3
am 3e5f4b53
: Merge "Check the elapsed time for decaying."
...
* commit '3e5f4b53b0b51288afdd921052974c6740a5aa6b':
Check the elapsed time for decaying.
2013-10-04 00:18:25 -07:00
Keisuke Kuroyanagi
3e5f4b53b0
Merge "Check the elapsed time for decaying."
2013-10-04 07:16:17 +00:00