The Android Automerger
|
5947514c5b
|
am 83412565: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
* commit '834125651c999db4cc3976c949f68bf5589058a0':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-12-12 21:31:21 -08:00 |
|
Satoshi Kataoka
|
18d033405c
|
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME
|
2013-12-13 04:15:33 +00:00 |
|
Satoshi Kataoka
|
95050f54e9
|
am 4d0fd045: am 6c8487ef: am efa3ef17: am 26a97909: am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys"
* commit '4d0fd04534243058d45cc95b903b19c0c1ee0e8c':
|
2013-12-13 04:15:28 +00:00 |
|
Baligh Uddin
|
0ba7f3b8d5
|
am 63f08cdf: (-s ours) am a1228301: (-s ours) am 2512314d: (-s ours) am 9eea9b07: (-s ours) am 38d169b3: (-s ours) am 1bbd4933: (-s ours) Import translations. DO NOT MERGE
* commit '63f08cdf91e56de6e562f5b936da7e85cb9c5636':
|
2013-12-13 04:15:23 +00:00 |
|
Baligh Uddin
|
e51cd4ad00
|
am 1489a305: (-s ours) am 65d60a19: (-s ours) am 73fd6c75: (-s ours) am 159e970c: (-s ours) am e1e6819a: (-s ours) Import translations. DO NOT MERGE
* commit '1489a305cce5ffff81adf76e1cafebff4dfcaf2e':
|
2013-12-13 04:15:17 +00:00 |
|
Keisuke Kuroyanagi
|
0a34702ea6
|
am 3abf01e9: am db3820d1: am 9ee3d14b: am 732b5e13: am 96b0f24f: am 3d929541: Fix build.
* commit '3abf01e94b47f122e1a1dac1bbb7dfd09534f827':
|
2013-12-13 04:15:12 +00:00 |
|
Keisuke Kuroyanagi
|
9777f05e14
|
am f44d44ac: am 20a8c2ee: am 2c79a62c: am 9115f38b: am ec5ad29a: am d25cd26f: Merge "Try decaying user history at hourly intervals."
* commit 'f44d44ac5e843c29728cb7b75ade5184b192ba73':
|
2013-12-13 04:15:08 +00:00 |
|
Keisuke Kuroyanagi
|
11c28239fc
|
am 755d1b07: am b2936b65: am 4d8f27ad: am 3cabfcef: am 28efd918: am ba9dc086: Merge "Use probability table for decaying dictionaries."
* commit '755d1b07b6a392b506f01f770bf6e44301f650aa':
|
2013-12-13 04:15:02 +00:00 |
|
Ken Wakasa
|
f5a6d77971
|
am 094efdcd: am 1af73ed5: am 5ec9e14e: am aa3ae615: am 72c870f5: am 596a565a: Merge "Remove some unused variables."
* commit '094efdcdfe2376885b641bc711f75a3182f391a4':
|
2013-12-13 04:14:58 +00:00 |
|
Keisuke Kuroyanagi
|
b078832507
|
am 9abd7930: am ced46407: am 4ff72a62: am a544cf0a: am 879ae3aa: am 21ce9c4a: Merge "Stochastic decay."
* commit '9abd79302c36a70d987af14d8aed87355958aa1a':
|
2013-12-13 04:14:53 +00:00 |
|
Baligh Uddin
|
c95efbbd57
|
keep history after reset to klp-modular-dev
|
2013-12-12 20:14:49 -08:00 |
|
Ken Wakasa
|
20d25d5e4e
|
am 219087ad: am f513e7bf: am fce7e730: am 8037b971: am da4d87ff: am 2dcb6337: Merge "Make SparseTable have multiple content tables."
* commit '219087adf0e11acfb2efe47d67129edcc6467233':
|
2013-12-13 04:14:48 +00:00 |
|
Jean Chalard
|
e6030b7c92
|
am 6ea5f8d7: am f08c2e18: am ff95897f: am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
* commit '6ea5f8d75f79e7dd3e1cb0a4f44418509f0dd2bf':
|
2013-12-13 04:14:43 +00:00 |
|
Keisuke Kuroyanagi
|
2b253559b3
|
am a4313507: am 36d64fc6: am 14307df8: am 8ee8178e: am 0fbad0fa: am 52c20927: Merge "Change name of DecayingUtils."
* commit 'a4313507ee04c82c6ea2422ecfad0c0de6e5c29d':
|
2013-12-13 04:14:37 +00:00 |
|
Satoshi Kataoka
|
6cfb583aac
|
am 6269b2d2: am c4f9bec4: am 03c5029c: am 96fdbaa3: am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity
* commit '6269b2d21a62a13eeeb14897fba6bf2293cee769':
|
2013-12-13 04:14:32 +00:00 |
|
Jean Chalard
|
c47e7d77ad
|
am 961499ed: am a4d94493: am 6877060b: am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
* commit '961499ed315af707350745b18d575b744ca8bf7c':
|
2013-12-13 04:14:24 +00:00 |
|
Satoshi Kataoka
|
ef27a404ce
|
am b4b5bb13: am db90aa44: am 3aa8c4cc: am 3cc9602c: am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit 'b4b5bb137c8ba0f26ed1e319336b8f97498013b9':
|
2013-12-13 04:14:19 +00:00 |
|
Keisuke Kuroyanagi
|
96fce9daf4
|
am 47a28073: am e90347d5: (-s ours) am 2d8f1ca8: (-s ours) am 193fea55: am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '47a280730c35a6a15ab1320e4ddb661dde2637c9':
|
2013-12-13 04:14:14 +00:00 |
|
Yuichiro Hanada
|
0d023cade2
|
am d2cb641f: am ee69dfab: am 1f321875: am 1a33d3eb: am a1ff53fb: am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit 'd2cb641f4740a8cdb99bc7ca31aee2ed72181e18':
|
2013-12-13 04:14:07 +00:00 |
|
Keisuke Kuroyanagi
|
8b29b39eaa
|
am aae39dca: am b55fc4a3: (-s ours) am 68ccd871: (-s ours) am a0efc4d1: am ab5affde: am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit 'aae39dca19a382f5cd6c9f5429991c853ab903cb':
|
2013-12-13 04:13:45 +00:00 |
|
Keisuke Kuroyanagi
|
917117e8d6
|
am e3547be8: am ad51305a: (-s ours) am db9a3e2f: (-s ours) am c53202b4: am 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
* commit 'e3547be8d0602df4b85fb8c09b17407e85ba0933':
|
2013-12-13 04:13:40 +00:00 |
|
Yuichiro Hanada
|
0d6e05fc9d
|
am 012d6776: am 2ee4749d: am 793047bb: am 89b44b43: am a317bf58: am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit '012d67765ad19102f93e914c6d0e3bd0371f2090':
|
2013-12-13 04:13:34 +00:00 |
|
Keisuke Kuroyanagi
|
d3cbcd518f
|
am 0c6110c4: am 909d11d2: (-s ours) am 872760d0: (-s ours) am 806a622b: am 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit '0c6110c429269214192745fdc99acad7f1e6cb50':
|
2013-12-13 04:13:29 +00:00 |
|
Keisuke Kuroyanagi
|
1bd4de3ce6
|
am 6f291ff1: am bb4c4a9e: (-s ours) am 55754a85: (-s ours) am 99ea6cbb: am 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
* commit '6f291ff18a2527f854623c4cfe5df7ead61eeee3':
|
2013-12-13 04:13:24 +00:00 |
|
Keisuke Kuroyanagi
|
aebdc7585b
|
am 86b5fedf: am 69de823e: (-s ours) am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '86b5fedf561501a10dfd8b7f0f23f1360825ce34':
|
2013-12-13 04:13:10 +00:00 |
|
Yuichiro Hanada
|
189f063132
|
am 4671e069: am a07ca2fb: am 7a00c08c: am 183718f2: am d2265036: am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit '4671e069778e4c29ba2e98ae445b06701feffaaf':
|
2013-12-13 04:12:58 +00:00 |
|
Keisuke Kuroyanagi
|
129223f5bf
|
am 718ea3a0: am c6bb1ffc: (-s ours) am 777b078d: (-s ours) am 2e082f46: am e0547020: am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit '718ea3a049ce8a1dd7beedf9bf8f53f2dab1450d':
|
2013-12-13 04:12:52 +00:00 |
|
Satoshi Kataoka
|
5c9eb96fad
|
am c07eb2a0: am 20deff07: am 9d527c02: am 2e7f74f0: am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
* commit 'c07eb2a0f3fe283923a327d78833b80cbd80bf36':
|
2013-12-13 04:12:47 +00:00 |
|
Jean Chalard
|
4f47e036e2
|
am 1229050f: am fcdfe6f3: am e8c01167: am e398d09a: am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
* commit '1229050f346c3b27dad32de0aae1524383edf549':
|
2013-12-13 04:12:42 +00:00 |
|
Jean Chalard
|
7a3cb2ae76
|
am a9170be5: am c54b61b9: am e2598657: am 1f8eab7d: am a6e7c3ff: am ff9476f1: Merge "Fix typos"
* commit 'a9170be568ddd850e71443142983d3da9fe6a28d':
|
2013-12-13 04:12:37 +00:00 |
|
Jean Chalard
|
fc329909d8
|
am 3e1332de: am 1508b0a7: am dc674273: am 805bae95: am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
* commit '3e1332dee6dd58a25ad9aa9c9fc59e34bc469fdc':
|
2013-12-13 04:12:32 +00:00 |
|
Ken Wakasa
|
9cd4506904
|
am 9cbfee4d: am cbf7517e: am 72b41953: am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit '9cbfee4d1b62f9efb6d9a1d872eaeb44b7e2fbd6':
|
2013-12-13 04:12:27 +00:00 |
|
Ken Wakasa
|
eeccfab716
|
am 956ac0d6: am 037e3e92: am 3d87eff7: am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '956ac0d663347fc13432088054869a04684f15f0':
|
2013-12-13 04:12:22 +00:00 |
|
Keisuke Kuroyanagi
|
43438cd731
|
am 9e8a781f: am 067c45d7: am 1fa00902: am d5ff552c: am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."
* commit '9e8a781f5749e58e19ead982284b6cfcaa1e99b0':
|
2013-12-13 04:12:17 +00:00 |
|
Ken Wakasa
|
ef61cc3db0
|
am 3ada5eff: am bfbea569: am f7b2afdd: am b04568b4: am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
* commit '3ada5eff560c2cc68dca47dddd93010330156bd5':
|
2013-12-13 04:12:11 +00:00 |
|
Satoshi Kataoka
|
441ac7829a
|
am 43da969b: am 157e5613: am 80e1b915: am acdd67bb: am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
* commit '43da969b2d2a058f89c5a3f145c977642c1d51c0':
|
2013-12-13 04:12:01 +00:00 |
|
Satoshi Kataoka
|
685e222d81
|
am 5da6dd4f: am d318214c: am bbc69086: am 8498002a: am db083a2b: am a4913994: Hide indication bar if only one page
* commit '5da6dd4f1e117df1f88bca7f9cd538669bf8baad':
|
2013-12-13 04:11:55 +00:00 |
|
Keisuke Kuroyanagi
|
faeca3b213
|
am 0b8afe47: am aa50b08a: am ebca9e69: am 07fe0997: am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
* commit '0b8afe47b2e30157e56b8ddd4bc97f4f4e62c751':
|
2013-12-13 04:11:51 +00:00 |
|
Jean Chalard
|
755921e5ef
|
am ac92967e: am 4c13a585: am c92d7d26: am 645d9927: am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
* commit 'ac92967ecfe044dbe1468df33136dd2a726780d6':
|
2013-12-13 04:11:45 +00:00 |
|
Ken Wakasa
|
34442ed0e0
|
am 1dcd6dc1: am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts.""
* commit '1dcd6dc13cdff1ba729cec273c670409576c24e6':
|
2013-12-13 04:11:40 +00:00 |
|
Ken Wakasa
|
e5bbe23ee3
|
am a0797f45: am 064661a3: Merge "Add Swiss French and German keyboard layouts."
* commit 'a0797f459b9bbe25cb68d0ef64f8d90bd63e0001':
|
2013-12-13 04:11:35 +00:00 |
|
Ed Heyl
|
d412279e4a
|
am 550a2e54: am 6b211313: am 6c69c218: am d8d2a9fc: am 02092936: merge in KQS81M
* commit '550a2e542e575fcb067b07985c2bfb2de057dc81':
|
2013-12-13 04:11:30 +00:00 |
|
Satoshi Kataoka
|
16844cb98c
|
am 0a90c5a5: am 9a802e0d: Merge "Support sw540 (ultra Z)"
* commit '0a90c5a5b02b8869fba73b6578a98a966d73d03e':
|
2013-12-13 04:11:24 +00:00 |
|
Baligh Uddin
|
5e11efa515
|
keep history after reset to klp-volantis-dev
|
2013-12-12 20:07:33 -08:00 |
|
Baligh Uddin
|
e60d947c1f
|
keep history after reset to klp-dev-plus-aosp
|
2013-12-12 20:00:43 -08:00 |
|
Baligh Uddin
|
847d956c70
|
keep history after reset to klp-ub-dev
|
2013-12-12 19:42:49 -08:00 |
|
Satoshi Kataoka
|
99f820d789
|
am 431fcb59: am 1c4180a8: am 963aadee: am 23436291: am f81c2274: am 8156a450: am 56997a80: Retry to tweak punctuations
* commit '431fcb59380eb1f03bd0504cc8556ca143295357':
|
2013-12-12 18:32:32 -08:00 |
|
Satoshi Kataoka
|
c2c5b7987c
|
am d8579c85: am fcbaf94c: am 6d95ca39: am fa26d892: am fb7f2750: am afe143c9: am 30ef03d8: Tweak vertical gap of Emoji palette
* commit 'd8579c85abad987595604f36a1d84a3d1d2946d6':
|
2013-12-12 18:32:28 -08:00 |
|
Satoshi Kataoka
|
cbc3856c2c
|
am eee05869: am ff5c7248: am cb864c55: am fb29ca21: am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit 'eee05869d993bd4b8a4bddf0a89d467ac835f0fd':
|
2013-12-12 18:32:24 -08:00 |
|
Jean Chalard
|
45679e3796
|
am 93ac69e0: am de11456a: am 71ed917a: am 817bed54: am e027ac9f: am a8285a24: am dfaec345: Merge "Always call finishComposingText before recapitalization"
* commit '93ac69e05b41585617e4806fcc294f58e2b8d642':
|
2013-12-12 18:32:19 -08:00 |
|