The Android Automerger
|
ae0871ef15
|
merge in klp-release history after reset to klp-dev
|
2013-10-10 06:01:47 -07:00 |
|
Jean Chalard
|
7e6ac9d727
|
Allow double-space-to-period after percent
Bug: 11158604
Change-Id: If8c94ef91ed58bb5028f51be7c8d9beb677436a4
|
2013-10-10 21:26:08 +09:00 |
|
Satoshi Kataoka
|
d733aadb8e
|
am 35c2a740: (-s ours) am 9b2d4bde: am 39ccc44b: am 6594318e: (-s ours) am 5ce96037: (-s ours) am d03f1793: am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2
* commit '35c2a7408bc6857c9b1ac5fd25c047a388442d0d':
|
2013-10-09 23:54:24 -07:00 |
|
Baligh Uddin
|
8435025f59
|
am 7ae28409: (-s ours) am 23f9540e: (-s ours) am a9a54bb4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '7ae28409c8dcfa477ba28b4555e67d2c9b49dd24':
Import translations. DO NOT MERGE
|
2013-10-09 23:54:21 -07:00 |
|
Jean Chalard
|
c54fb48272
|
am 0126566c: am 0ded4114: am 73ca0f2c: am 423921ca: Merge "Fallback on empty locales."
* commit '0126566c03c47176172bfbcd78ee45e1929e6ffc':
|
2013-10-09 23:54:18 -07:00 |
|
Jean Chalard
|
a7340558d5
|
am 470f13fc: am 3ab42a00: am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji."
* commit '470f13fc1155ec3ca1095d71a088175d9861849b':
|
2013-10-09 23:54:15 -07:00 |
|
Satoshi Kataoka
|
f647ea4403
|
am 605bca9b: am f12df9e4: am 3bf2c598: am 1d188a28: Merge "Fix emoji"
* commit '605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d':
|
2013-10-09 23:54:12 -07:00 |
|
Satoshi Kataoka
|
fa9c15aefd
|
am b7c0e1a0: am 383da922: am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior"
* commit 'b7c0e1a0ac6e5f71d7aa347b83d781e5a76de81e':
|
2013-10-09 23:54:09 -07:00 |
|
Ken Wakasa
|
576d5bcaa7
|
am 2226498c: am d439ee37: am f330de95: am c01707db: Merge "Suppress exceptions that have always been happening."
* commit '2226498c64786f9d1eafcc30a42596ebaeb3d78f':
|
2013-10-09 23:54:06 -07:00 |
|
Ken Wakasa
|
1483647cd3
|
am b2f59966: am bcb095e7: am e6a64022: am 676bb517: Merge "Add Ver4DictUpdater."
* commit 'b2f59966e270c0ec38d679f613cd87bd9f937559':
|
2013-10-09 23:54:03 -07:00 |
|
Ken Wakasa
|
c619d676ae
|
am 3418b4df: am f9de7ca5: am d5c90d9d: am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."
* commit '3418b4dfd9a731caed965ce5f660d1c2664c665c':
|
2013-10-09 23:54:00 -07:00 |
|
Satoshi Kataoka
|
2cf4cee7ed
|
am 3accabfc: am 0f0cd69a: am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets"
* commit '3accabfc60858537304c8647b0d7efb44f7770ed':
|
2013-10-09 23:53:57 -07:00 |
|
Keisuke Kuroyanagi
|
2120217102
|
am 115b7cf6: am 7f876997: am 799263c3: am 966af8b5: Merge "Make BinaryDictionaryTests use current time as a seed."
* commit '115b7cf645727688042ae7950a7d12a346e6b35d':
|
2013-10-09 23:53:54 -07:00 |
|
Keisuke Kuroyanagi
|
f4efc70df0
|
am fa65c8bb: am 449245c8: am 5544b966: am 3e5f4b53: Merge "Check the elapsed time for decaying."
* commit 'fa65c8bbe5db96357d37320998f6e3197d987064':
|
2013-10-09 23:53:50 -07:00 |
|
Yuichiro Hanada
|
1d5fd266ba
|
am 07dcb6ac: am 1f6b9d7f: am 10100b2c: am 14d31d46: Add AbstractDictDecoder.
* commit '07dcb6acab44c771f8631c345468ce9202b5886f':
|
2013-10-09 23:53:47 -07:00 |
|
Ken Wakasa
|
76a16d1b4d
|
am 80877911: am aa958adf: am 73ddd404: am 78409cd9: Merge "Separate shortcut targets from the trie file."
* commit '8087791167c23fd3f1b6fb3a97a323f93e9e2a6c':
|
2013-10-09 23:53:44 -07:00 |
|
Xiaojun Bi
|
c1c361e748
|
am 445291b4: am df2a70ce: am 987fd92d: am 0b626214: Merge "Optimize the parameters for the typing algorithm"
* commit '445291b4db6bb55a2d64f9b93bb50708bb0a19b7':
|
2013-10-09 23:53:40 -07:00 |
|
Satoshi Kataoka
|
0adaaeb03e
|
am ad416c97: am d1e32ef6: am eb0526a9: am ef64676b: Merge "Revert emoji key position to JB-mr2"
* commit 'ad416c97bca9519caee4e6d48b7e261c16188596':
|
2013-10-09 23:53:36 -07:00 |
|
Keisuke Kuroyanagi
|
a095215f35
|
am 09ddb39d: (-s ours) am 3d5d9878: am 38532027: am 4aefcf78: (-s ours) am b6b39e5a: (-s ours) am b04ad22c: am 5c314825: (-s ours) Fix: Native crash when an empty attribute is written. DO NOT MERGE
* commit '09ddb39d8853e8e5c7006a9a9ee54b147b79c9c6':
|
2013-10-09 23:53:33 -07:00 |
|
Qiwen Zhao
|
c0dba0cb25
|
am c0ae59d5: am 20340c8d: am 1d814fa0: am 500a4a04: am e3bfed87: am 00fbb6f2: am 723da79c: keep history after reset to jb-ub-latinimegoogle-bayo
* commit 'c0ae59d5183c84597e1989512b52fd997290c4c3':
|
2013-10-09 23:53:30 -07:00 |
|
The Android Automerger
|
e3894c10fd
|
am 624f7d18: am b6445dce: am 0b016e9f: am 6dc50c6b: am f5907064: am 9e1a7ace: am 469de60d: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
* commit '624f7d18b09a001a5aa82627092f32b9fec24ece':
|
2013-10-09 23:53:28 -07:00 |
|
Baligh Uddin
|
062e8a7dac
|
am 34436d90: (-s ours) am 0b2e954d: (-s ours) am 0b846b5e: (-s ours) am a113196f: (-s ours) am 74b2fb2f: (-s ours) am e5a81559: (-s ours) am e8a00a7e: (-s ours) am 3efc5b6b: (-s ours) Import translations. DO NOT MERGE
* commit '34436d905d5eea828d825d9a893b9ee4696b27f8':
|
2013-10-09 23:53:25 -07:00 |
|
Keisuke Kuroyanagi
|
1f89a6f2c9
|
am 5d820699: (-s ours) am 178aca8d: am 6aed2486: am b5048cf4: (-s ours) am 65256108: (-s ours) am c754d187: am babd4075: (-s ours) am 2c1faeda: (-s ours) am 10fa6a2e: (-s ours) Stop reading dictionary while regenerating. (DO NOT MERGE)
* commit '5d8206993382510617996f89a13c5dd4a69b837d':
|
2013-10-09 23:53:22 -07:00 |
|
Baligh Uddin
|
ecfea2e927
|
am e4930834: (-s ours) am ee12974b: (-s ours) am 4b65f007: (-s ours) am 76635285: (-s ours) am f9a6b21f: (-s ours) am a6c3d80a: (-s ours) am 312c0f5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'e4930834c0f2b53f84ae47df2dcf310fcec57d7c':
|
2013-10-09 23:53:19 -07:00 |
|
Baligh Uddin
|
10d136e4a2
|
am 28c1764d: (-s ours) am 393a4356: (-s ours) am e4bbbf17: (-s ours) am d297ba30: (-s ours) am 5e0cd120: (-s ours) am 72022bf3: (-s ours) am 2a66f52d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '28c1764d2ab46d4bbe5c7a01729d7ca4d1f31ef1':
|
2013-10-09 23:53:16 -07:00 |
|
Alan Viverette
|
6b96e93736
|
am c94361ea: am 078ada0c: am 08d05fac: am 54f2b5e5: am 2e0a2b2c: am 5c35c6ac: am 1e2543f1: am 458fb52b: Merge "Speak auto-corrections for accessibility"
* commit 'c94361ea273ef7f69c3cd86d0d7b394712440365':
|
2013-10-09 23:53:13 -07:00 |
|
Jean Chalard
|
5ed435db4f
|
am 4881766d: am 5b183661: am 61b9500f: am 7e06a5a0: am 975520fc: am 78295f7f: am 9c0740b7: am bf1beefd: Merge "Surface the distance after first word for autocommit."
* commit '4881766d2e4a50a0c3b1cbbde9860e8f7f37c5a2':
|
2013-10-09 23:53:10 -07:00 |
|
Keisuke Kuroyanagi
|
343f9e9f43
|
am 4e64f74f: am 58c52d08: am eebdb97f: am 3e43916f: am 234b8f07: am 7a661698: am 12d3bd22: am 65330d28: Merge "Implement simple dictionary decay."
* commit '4e64f74f7d6aeabd917ec1a6f9b849693c45af0b':
|
2013-10-09 23:53:07 -07:00 |
|
Keisuke Kuroyanagi
|
9465a3b276
|
am 6ef9e109: am 69cb5213: am 507ba65c: am 1eaddbdc: am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries."
* commit '6ef9e1092e6665227b28f6475a2010fb1988da9c':
|
2013-10-09 23:53:03 -07:00 |
|
Jean Chalard
|
12ffd0ec8f
|
am 4b633624: am 0e078177: am 20fed1b8: am 17b67822: am cdf39e66: am b424bb72: am 90f74e23: am 42941dd2: Merge "Update dictionaries"
* commit '4b633624723c28148a0958dcf8bb1c329a767109':
|
2013-10-09 23:52:59 -07:00 |
|
Ken Wakasa
|
2d4fea6cf9
|
am 88300105: am 4292b3b8: am a1df4c99: am ff1bb674: am dee48c88: am 9019d51c: am af5511c8: am 25f47828: Merge "Separate bigram entries from the trie file."
* commit '88300105e4ce3b923a3382f0fd0351ab85c1a2a9':
|
2013-10-09 23:52:55 -07:00 |
|
Ken Wakasa
|
283a6e3b0a
|
am f2fa14ca: am 415cf1c1: am 9dca25dc: am 77167567: am 9f08312f: am ab4f3bcb: am 2b73561c: am d40a931a: Merge "Change scopes of some methods in DynamicBinaryDictIOUtils."
* commit 'f2fa14ca78b1d8e6ab2dcfcc96ea2262445b7f96':
|
2013-10-09 23:52:51 -07:00 |
|
Jean Chalard
|
fea0c13200
|
am bffb7011: am bb43c028: am 220be6b9: am 90a779a3: am f13acd4a: am 18495ea3: am a8c74842: am 16a6b2a9: Merge "Make dicttool read the compressed combined format."
* commit 'bffb7011f0bbc9bd8604d7f141d5be07eea9d29a':
|
2013-10-09 23:52:47 -07:00 |
|
Keisuke Kuroyanagi
|
978f3d6ef3
|
am e2bfd532: am 7de9fe57: am d4802de8: am 25f60d7a: am 5a9f255a: am b5518a23: am bf503325: am b698e9c1: Fix build.
* commit 'e2bfd5325bfd1de92b663a6ef0bb94139abbe666':
|
2013-10-09 23:52:44 -07:00 |
|
Keisuke Kuroyanagi
|
9db4f04a98
|
am b8edd9bc: am ac9295a7: am 99616547: am 2c2e2d9c: am 5e70221c: am 4c677d7b: am 0aaf42b4: am c1851004: Prepare dictionary decay.
* commit 'b8edd9bc299b183cdb8867adad6a9b73365e08dd':
|
2013-10-09 23:52:40 -07:00 |
|
Keisuke Kuroyanagi
|
71deae4e16
|
am 7a523986: am 49caffa3: am 8b663efd: am 1bbd4a91: am 92bba1e3: am 72e6932d: am f2800fc6: am 1cf4789b: Merge "Set header attributes for ExpandableBinaryDictionary."
* commit '7a5239867b71b3b3a38a00df7c1bc2d91d6a15df':
|
2013-10-09 23:52:36 -07:00 |
|
Satoshi Kataoka
|
ae776adb95
|
am 3fd76958: am e2498760: am 28e88f9c: am f63c65ee: am 9442c3f3: am 33587f91: am 9c6e7e23: am b0c5ddb9: Merge "Stop vibration while repeating delete key in emoji view"
* commit '3fd7695839c9a961c333c5680c85f0fa4d229616':
|
2013-10-09 23:52:32 -07:00 |
|
Baligh Uddin
|
b857f5699e
|
am 02d2f5dd: (-s ours) am 70e8cddb: (-s ours) am 711a53e0: (-s ours) am a3448969: (-s ours) am 2cc6956c: (-s ours) am 17581e41: (-s ours) am 12d095ea: (-s ours) Import translations. DO NOT MERGE
* commit '02d2f5dd84223a29b8242d9d2c4b6849eba5ddf6':
|
2013-10-09 23:52:29 -07:00 |
|
Satoshi Kataoka
|
dde9a3b244
|
am c614e7af: am 2cf3cd4b: am 46237435: am 60bf2265: am b775b7ba: am 8f650683: am 6f855d06: am a6e2ec53: Merge "Reduce Emoji size"
* commit 'c614e7afb3648840fed00e88d647929245b0e8ec':
|
2013-10-09 23:52:26 -07:00 |
|
Satoshi Kataoka
|
bf0fbb40aa
|
am 70ff04e7: am 723cf69d: am f0bc854d: am ddeafb3c: am 641662ca: am 523d6090: am 36301d55: am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"
* commit '70ff04e705c6c56bebafe2fbda97f6db777d2bab':
|
2013-10-09 23:52:23 -07:00 |
|
Keisuke Kuroyanagi
|
d6971df09f
|
am d18f3119: am be666d09: am ef0f04e2: am 930770a5: am a343e80a: am c9b9c2a3: am ecc1408e: am 68bc4ba5: Merge "Add boundary checking for PtNode Array reading."
* commit 'd18f3119bfb2311206c8dc44880a4bf375be055f':
|
2013-10-09 23:52:19 -07:00 |
|
Keisuke Kuroyanagi
|
0bf9accaac
|
am b94e55e0: am 02e78c9e: am 6e7a662a: am 7df210f7: am ff305ac2: am 6540132d: am de12fcb0: am 8b580819: Merge "Add unigram/bigram counting."
* commit 'b94e55e07d5297874ccad1716cf74c1ca0bac146':
|
2013-10-09 23:52:15 -07:00 |
|
Keisuke Kuroyanagi
|
1beadbb4d8
|
am d4ca3f1c: am 55fe093c: am 8bddbf88: am 9e148bb5: am ae612f73: am 9cbb33f1: am be6076b0: am e74d4a18: Stop reading dictionary while regenerating.
* commit 'd4ca3f1cacdc198850fa3fdd568e706241048f13':
|
2013-10-09 23:52:12 -07:00 |
|
Jean Chalard
|
26a8e5337f
|
am b41bea65: am e7cd5b5e: am 5a383db5: am 8e37ad38: am 5e0699bc: am 534e25f2: am 4ac33aca: am b7dfacd3: Merge "Send backspace as an event when TYPE_NULL."
* commit 'b41bea65502ce7339665859d3c2c81b4a29194e4':
|
2013-10-09 23:52:08 -07:00 |
|
Yuichiro Hanada
|
421f53b6b1
|
am 8ba3389a: am 8ad41e3a: am de71361a: am 04121a9a: am 8ab40ebd: am 8e235e56: am 1e886ac5: am a328f538: Fix PrioritizedSerialExecutor.
* commit '8ba3389adce506820d404c63c2b9fdeaeb0391c4':
|
2013-10-09 23:52:04 -07:00 |
|
Yuichiro Hanada
|
1b6799cc18
|
am 14e596ab: am 1f419264: am a616775a: am 9442f7c1: am 18f70d5f: am 000ce0d5: am 704ab0f6: am 781feb74: Remove unused methods.
* commit '14e596ab947dc90459ede0dcb49051ba750bb925':
|
2013-10-09 23:52:00 -07:00 |
|
Baligh Uddin
|
748fb64b56
|
am acbbffd5: (-s ours) am a8071f22: (-s ours) am 0af45056: (-s ours) am aa7636c6: (-s ours) am 923043b9: (-s ours) am 3cbc3787: (-s ours) am c3cee388: (-s ours) am 45de3925: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'acbbffd506425f515796cbb659f051b4be2739a5':
|
2013-10-09 23:51:58 -07:00 |
|
Baligh Uddin
|
9043ad9c6e
|
am 57ea68e9: am 457a14cb: am 2462d645: am f04323ad: am ab2844ff: am 2da086c0: am abb63c12: am 15da61b7: am cd2923a6: keep history after reset to jb-ub-latinimegoogle-bayo
* commit '57ea68e9d9dc3b4471a913c0966bb5dc47a44b16':
|
2013-10-09 23:51:54 -07:00 |
|
Baligh Uddin
|
a56d7e6c17
|
am 0ba7c2de: am 28f98024: am 9a1d681d: am ccfbcdb5: am 4c70c7c3: am e2f7405e: am b60d479a: am bca73335: am 2aea83a4: (-s ours) keep history after reset to jb-ub-latinimegoogle-bayo
* commit '0ba7c2deb19bc7212b357f6c41416c059f90e6ee':
|
2013-10-09 23:51:50 -07:00 |
|
Baligh Uddin
|
739a9e6cfe
|
am 65f21245: (-s ours) am bddafe7c: (-s ours) am 289c772c: (-s ours) am 92ee87da: (-s ours) am 31e36465: (-s ours) am e6ba144e: (-s ours) am 932d0ba8: (-s ours) am b3e68321: (-s ours) am cc670c5d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bay
* commit '65f212458d92f70f4125af0f4f07e31bfc7fec9c':
|
2013-10-09 23:51:46 -07:00 |
|