The Android Open Source Project
|
ba843447ae
|
am b9515308: am 838a0997: am 32363a88: am 050cb0b5: (-s ours) am 7ef9b61e: (-s ours) am 680f5e14: am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -
* commit 'b95153085c3891b602f2be4628b313f48c72ce0f':
|
2013-10-09 23:14:22 -07:00 |
|
Baligh Uddin
|
d4dc8af32a
|
am 1322e6fb: (-s ours) am 5208b6eb: (-s ours) am 93d504ad: (-s ours) am e4351946: (-s ours) am dbf6adca: (-s ours) am 7a8ea815: (-s ours) am bc1ad68e: (-s ours) am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '1322e6fb71f7c9dec305a13ffc0c611042d55d09':
|
2013-10-09 23:14:19 -07:00 |
|
Satoshi Kataoka
|
e7d1d9557e
|
am 90dce8ce: am 128c878a: am 3b796399: am 7520c475: am 547ebb76: am 2e5e3edd: am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"
* commit '90dce8ce638de5fac066d38e92a419895230c9c1':
|
2013-10-09 23:14:15 -07:00 |
|
Tadashi G. Takaoka
|
932d2c0521
|
am bb0264ca: am 7cea1827: am 1275ce1e: am 5f1ec034: am 85c2ce7c: am 81e36c3c: am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit 'bb0264ca544ed3215c56efa471bbf6fb14aaa6ff':
|
2013-10-09 23:14:12 -07:00 |
|
Tadashi G. Takaoka
|
0dd3a964b4
|
am 149490bd: am 54247b09: am fea1db68: am 6d7c5ab0: am e4442e86: am 3edb2b8b: am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"
* commit '149490bd0bc296220810a56a5c034e4248a00924':
|
2013-10-09 23:14:09 -07:00 |
|
Jean Chalard
|
916bb97631
|
am 67b93191: am 3b73c7bc: am b0a9aefd: am 97e9b4ef: am ebeefea1: am 450e3af1: am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"
* commit '67b931913b63373f4b10b5c4ad626ef544b4ae8b':
|
2013-10-09 23:14:06 -07:00 |
|
Tadashi G. Takaoka
|
cd0a819076
|
am 96aab7a0: (-s ours) am 6f152929: am 7f47cbf3: am 57ccd8e8: (-s ours) am e64fc097: (-s ours) am e87c22fa: am 8f5921bf: (-s ours) am b17fe378: (-s ours) am bd21edc9: (-s ours) am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE)
* commit '96aab7a0a690e2918b1b782666f59bec7e20b29d':
|
2013-10-09 23:14:03 -07:00 |
|
Tadashi G. Takaoka
|
f5d58adaaf
|
am d07a0d66: am 320b5030: am 11687191: am 9b07afcb: am 99f115bf: am 3872c243: am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"
* commit 'd07a0d66bf7f45fcb39ebcf704a552293216ffdb':
|
2013-10-09 23:13:59 -07:00 |
|
Jean Chalard
|
e44869c1ae
|
am da06f2f6: am ed51dd65: am 67940e30: am 628b1ebd: am b56edf6f: am f022548e: am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
* commit 'da06f2f665bcadaf8b90467289476578d5dc3117':
|
2013-10-09 23:13:56 -07:00 |
|
Satoshi Kataoka
|
929521a135
|
am d1c28ace: am 95e5ce2b: am 9288df53: am fda37961: am 8452422b: am 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"
* commit 'd1c28ace1f86b0861184c3c5edb79185041d0cba':
|
2013-10-09 23:13:52 -07:00 |
|
Tadashi G. Takaoka
|
b18e8e5dc0
|
am a0f2ec75: am eab57f47: am b82c878c: am 4aef55d9: am 684732a1: am 3f75c760: am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package
* commit 'a0f2ec758123ab99dc65b45867becd0006c7771d':
|
2013-10-09 23:13:49 -07:00 |
|
Tadashi G. Takaoka
|
4fff2f0b16
|
am a4772d7c: am 1ef056f8: am a85daec2: am 93d9f1b2: am 393cb4d9: am 8fa567c7: am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit 'a4772d7c30a9ef381bb82ebd77631db2882b008d':
|
2013-10-09 23:13:46 -07:00 |
|
Tadashi G. Takaoka
|
309ae31a3b
|
am 45e99e88: am 771f3681: am 69ff2d83: am 3ef35fe3: am 23e27aae: am 99771a81: am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
* commit '45e99e88b59dfc326de0627a49edd2ae0664436e':
|
2013-10-09 23:13:42 -07:00 |
|
Tadashi G. Takaoka
|
13e4e87baa
|
am 01c6fd0c: am 070ffc62: am f3e5c12a: am d43c17f1: am 7bb1019d: am 019ea417: am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '01c6fd0c0a7032a0da1f43cb673562deb07a6451':
|
2013-10-09 23:13:38 -07:00 |
|
Ken Wakasa
|
5792d4259e
|
am 0daf87a4: am 5d90c081: am a4b29aa1: am 89356a2b: am d1090278: am 26aed3a5: am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code
* commit '0daf87a437c76b99e2ebd38a423ded17105aaeb0':
|
2013-10-09 23:13:35 -07:00 |
|
Ken Wakasa
|
434a97bf4e
|
am c6a67fa0: am 4d0ac436: am eec6c548: am 6ce09940: am 9147aa06: am e7726dea: am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit 'c6a67fa07853f4b37c7cc698e66afe52fca4c51a':
|
2013-10-09 23:13:32 -07:00 |
|
Kurt Partridge
|
807ba6e4ea
|
am a96c872a: am 8a4078aa: am 7fa4026c: am 990a9b33: am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit 'a96c872ac0ad4bd513cf546fd4d631f564fad3c7':
|
2013-10-09 23:13:29 -07:00 |
|
Baligh Uddin
|
0493124518
|
am a6d52095: (-s ours) am 09ff83d4: (-s ours) am 12a8e54e: (-s ours) am 07b83868: (-s ours) am 2159d77e: (-s ours) am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'a6d52095219e48318982804256e052fe19deab23':
|
2013-10-09 23:13:25 -07:00 |
|
The Android Open Source Project
|
5c55f94b19
|
am 18fe7d50: (-s ours) am bd65e610: am 60aa327d: am 68b247d8: (-s ours) am d1938819: (-s ours) am d55e661e: am 3392102c: (-s ours) am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '18fe7d501b924bd1fcb86939594e5d5034881d43':
|
2013-10-09 23:13:22 -07:00 |
|
Tadashi G. Takaoka
|
a56210d1c3
|
am 776bd370: am 8b8eca04: am e1890566: am d19697b0: am 599e9481: am 71159b59: am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '776bd37003a6c705bd6581332441e309eb0d2f24':
|
2013-10-09 23:13:18 -07:00 |
|
Kurt Partridge
|
678ac4325b
|
am 66ed4984: am 7cb81dff: am b2578efb: am e0a874f9: am 43d56da0: am 6e619633: am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '66ed4984ba0fbd9d0f8988a0f5aafa89c85f3aad':
|
2013-10-09 23:13:14 -07:00 |
|
Ken Wakasa
|
f6b7695f39
|
am 4a3a45cd: am c44ca2ba: am f9e06fd6: am eccd780e: am 682edd51: am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '4a3a45cd23ad6a0b28371828250dfe4bdc890608':
|
2013-10-09 23:13:11 -07:00 |
|
Satoshi Kataoka
|
bd785389d8
|
am 4942e986: am 69e2fd3e: am ae9edb23: am bd05c5e7: am 728217a6: am cd42b44e: am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit '4942e98625af69c8928f3186ff26d773d17ef3b9':
|
2013-10-09 23:13:07 -07:00 |
|
Ken Wakasa
|
86e467aabe
|
am 4780eb6f: am 27ee51bd: am 590a06f2: am 4f4ac50a: am 0d3d4f4a: am 54415777: am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '4780eb6f4e8b1812a2c313ff79c08e959045ca9a':
|
2013-10-09 23:13:04 -07:00 |
|
Satoshi Kataoka
|
a4d7f08b43
|
am 0ffb00e4: am f6560ae6: am 81c4c752: am 6b57cd1a: am ef8e1ead: am 19ae94c7: am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit '0ffb00e4ab026b8591105eee520a767aa18a57fa':
|
2013-10-09 23:13:00 -07:00 |
|
Tadashi G. Takaoka
|
55c4fe1216
|
am 7946358e: am c7961c0b: am 713dcb8d: am 1fa7277a: am d15f772b: am a946ab7a: am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit '7946358e254b166f02843e59b45c832301a1030f':
|
2013-10-09 23:12:57 -07:00 |
|
Satoshi Kataoka
|
4ea7d98ef1
|
am 1e99c86a: am 30c0a9b7: am 71f2df97: am 685776a7: am 2884dabe: am b6c875f6: am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit '1e99c86a1547d0a2a9f97327736ed553e7cd4661':
|
2013-10-09 23:12:52 -07:00 |
|
Satoshi Kataoka
|
d53fefcf9d
|
am e48c1e98: am d3ea5036: am 50a1e3ca: am 52776463: am 560efcc9: am 039cef26: am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit 'e48c1e989a6581568fc9b609e4ff7ccf223da5d6':
|
2013-10-09 23:12:49 -07:00 |
|
Tadashi G. Takaoka
|
6df71a47b8
|
am 15b5649f: am 2b1a3784: am 1d27d8df: am 71e6182a: am 98ee25da: am 75a13052: am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '15b5649fcd6b1c5b7479a5198e57ec5924ce5d71':
|
2013-10-09 23:12:41 -07:00 |
|
Satoshi Kataoka
|
799bbe1275
|
am 47e5187e: am 32eb8fe5: am 1f37cf87: am 445183d2: am 6141f237: am 4b4edf8f: am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '47e5187e2903ef4d38a2f9574133d82f0b934d6b':
|
2013-10-09 23:12:38 -07:00 |
|
Satoshi Kataoka
|
b95f3efb47
|
am f7a9176f: am fd21d89d: am 781f3169: am bf132663: am d5ba7513: am d13a713a: am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'f7a9176f3e44fac002f57c54de9aaf02b67e8a7d':
|
2013-10-09 23:12:35 -07:00 |
|
Satoshi Kataoka
|
5ef55234bf
|
am da844e30: am 2a0e1f7f: am 52d60bc1: am 27c47877: am 0047bea0: am b6efea52: am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit 'da844e308cb6c4ebce2e15544836c2366199a3cd':
|
2013-10-09 23:12:31 -07:00 |
|
Jean Chalard
|
abe2c627bb
|
am 5ecb7574: am 10c32f1e: am 110b5cf8: am 8c35265a: am 014b05f3: am 7f6ee228: am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '5ecb75745bbd24a70f5b8fd823ef53cd5fae8b89':
|
2013-10-09 23:12:28 -07:00 |
|
Satoshi Kataoka
|
bc4caa5e6d
|
am 1b612a5b: am 63ff6300: am ff26deee: am e5d58254: am a7ecf8c3: am 10876211: am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit '1b612a5bcc81cf81ab000cdafdac8df6ff41f79d':
|
2013-10-09 23:12:25 -07:00 |
|
Tadashi G. Takaoka
|
e5ca70c572
|
am c6434a0a: am 841cc412: am 34c666fd: am 68966f90: am ddc57756: am f952acee: am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit 'c6434a0acbf877c197949279876daf8f814b490b':
|
2013-10-09 23:12:21 -07:00 |
|
Kurt Partridge
|
14a7204b17
|
am 95760be7: am a506e73e: am ffc136ee: am d85afb57: am a2b94101: am a6b1c601: am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit '95760be70c1f1893b19067352c6ec82ce705ebe2':
|
2013-10-09 23:12:18 -07:00 |
|
Satoshi Kataoka
|
cc212f8ef7
|
am eba48abd: am b9485e72: am d1afce4c: am e586baf7: am 36cfd857: am c613917f: am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit 'eba48abd2dfae37d2bfc59c9bb8715cfb59d1d04':
|
2013-10-09 23:12:14 -07:00 |
|
Ken Wakasa
|
d6715afc7d
|
am 5317352c: am b7f5d4cd: am 32b8f1bd: am 50616095: am ee119b18: am d1042932: am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit '5317352cea76844ede3773032ee48bd37e6d1944':
|
2013-10-09 23:12:11 -07:00 |
|
Kurt Partridge
|
d7b81612bc
|
am a3414b47: am 01031531: am 6fa0fdbe: am 9130d288: am 8690602b: am 1fb6e4a3: am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit 'a3414b4712d47d9e14de02474380f11cf5dd6443':
|
2013-10-09 23:12:07 -07:00 |
|
Kurt Partridge
|
693d741609
|
am c84aff4f: am d43ec011: am ba3dd00a: am be5baa54: am ae37582d: am 3b77d996: am 389a4da0: am 41da00d3: am 173ac0c6: am 74330288: Merge "Uncommit separator LogUnits"
* commit 'c84aff4ffdf640701a32cfff649f10c5bdd863e1':
|
2013-10-09 23:12:01 -07:00 |
|
Kurt Partridge
|
af63e355a3
|
am 484f15ed: am 325c1317: am 205a28c8: am f0846076: am 7c943ec2: am cfe54354: am 25f302a1: am 84e4a9bf: am a856138c: am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
* commit '484f15ed2123b3425aa76ffe3c97b95f24368077':
|
2013-10-09 23:11:58 -07:00 |
|
Kurt Partridge
|
de247ee7ca
|
am 2e8f5486: am d4222f17: am 23536334: am 724bf4c7: am 37f53939: am f2b30b6b: am 39eed879: am 4094dd7f: am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '2e8f54862229dd347723724ed3afcc7943a63e89':
|
2013-10-09 23:11:54 -07:00 |
|
Ken Wakasa
|
a0ab571830
|
am b3c4bc8a: am de833e1a: am 80c2eb42: am aad63d07: am 667e1f17: am 5b34dea0: am e34af095: am 1e1d2abd: am fe712a29: am f497e1e5: Move suggest_options.h to suggest/core
* commit 'b3c4bc8a37583c3bb8f40de87b542e0d7ea247b5':
|
2013-10-09 23:11:51 -07:00 |
|
Keisuke Kuroyanagi
|
b9b1a2c5f5
|
am d5a9663a: am 93225a51: am 75045673: am 8d612c65: am 66dc7e13: am 09b91a57: am 59bb6d0a: am 30de4e06: am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit 'd5a9663a29d01425b0e8e01a3b1cf49c56a33029':
|
2013-10-09 23:11:47 -07:00 |
|
Keisuke Kuroyanagi
|
0d43eea05b
|
am f7dc7224: am c232481c: am 4de1bea0: am 5c935a1e: am 70cc03dc: am 96ca1fc9: am dc4b70b8: am c9fa8db0: am 12e2bd25: am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit 'f7dc7224d3fb1257909b37b06a64070268fd3a54':
|
2013-10-09 23:11:45 -07:00 |
|
Baligh Uddin
|
551cc26218
|
am af34fdae: (-s ours) am 4253e9ee: (-s ours) am 687ae561: (-s ours) am a7bb36b3: (-s ours) am 45eac3bc: (-s ours) am 66b22e90: (-s ours) am 0b57d3b7: (-s ours) am 7ea32c70: (-s ours) am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'af34fdaeb5bf6c1e658bf4db23988e31e1128d90':
|
2013-10-09 23:11:39 -07:00 |
|
Ken Wakasa
|
475e66b42c
|
am f0541982: am 85b7dd9b: am cc87d8de: am 939dbcca: am 249b21ca: am b509e43a: am 58c6f239: am e53f5b8a: am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit 'f0541982c3c695709eba5a1fa3c601d59073ba47':
|
2013-10-09 23:11:36 -07:00 |
|
Jean Chalard
|
66cf85c498
|
am 43721072: am d582133a: am e2f8a000: am 69fc3dcb: am 36f1d947: am 348ae75c: am 767011c0: am a8f8dab6: am f6a4670d: am 26f48949: Fix the displayed status after download
* commit '4372107234bb9664b309321609bd48e1aea34959':
|
2013-10-09 23:11:32 -07:00 |
|
Jean Chalard
|
d54e74a5ed
|
am e2c0a093: am 5e26323e: am 5cb968dc: am 83e1750b: am f3197a00: am 2aeea5fa: am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries from tests"
* commit 'e2c0a093d858fb2cfa56aa9b87029e506d3258c5':
|
2013-10-09 23:11:28 -07:00 |
|
Tadashi G. Takaoka
|
6b14452def
|
am 9ec38cce: am 8f442723: am a20fbb52: am 72355432: am b5d9016a: am a79e3b0b: am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
* commit '9ec38ccee86b6d8dab7069bab1350d0389e0dda1':
|
2013-10-09 23:11:25 -07:00 |
|