The Android Open Source Project
|
050cb0b562
|
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 - do not merge
* commit '7ef9b61e1285930581b0720f8c8cda8bc00c73af':
|
2013-10-03 16:13:00 -07:00 |
|
Baligh Uddin
|
e43519463e
|
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 'dbf6adca3d668f7b1681e469bfd09e3879e4804e':
|
2013-10-03 16:12:58 -07:00 |
|
Satoshi Kataoka
|
7520c475ad
|
am 547ebb76: am 2e5e3edd: am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"
* commit '547ebb760dae426aeb4bc345bb949264294fcc03':
|
2013-10-03 16:12:55 -07:00 |
|
Tadashi G. Takaoka
|
5f1ec03467
|
am 85c2ce7c: am 81e36c3c: am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit '85c2ce7cd107997d3c106bd29f23ed72fa97a24c':
|
2013-10-03 16:12:53 -07:00 |
|
Tadashi G. Takaoka
|
6d7c5ab0bc
|
am e4442e86: am 3edb2b8b: am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"
* commit 'e4442e86e27110e7053686e38c1b8551da7cc7a7':
|
2013-10-03 16:12:50 -07:00 |
|
Jean Chalard
|
97e9b4ef80
|
am ebeefea1: am 450e3af1: am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"
* commit 'ebeefea1fbab14a2f6f7ffd5fe1732ea0840a864':
|
2013-10-03 16:12:48 -07:00 |
|
Tadashi G. Takaoka
|
57ccd8e88f
|
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 'e64fc097ba95aef7504877b690abd48d28b10c19':
|
2013-10-03 16:12:46 -07:00 |
|
Tadashi G. Takaoka
|
9b07afcbe3
|
am 99f115bf: am 3872c243: am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"
* commit '99f115bff7bb3246ca5b31350fdd152f4084ab42':
|
2013-10-03 16:12:43 -07:00 |
|
Jean Chalard
|
628b1ebd34
|
am b56edf6f: am f022548e: am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
* commit 'b56edf6f21101a711661aa9d4a74333f7f738684':
|
2013-10-03 16:12:41 -07:00 |
|
Satoshi Kataoka
|
fda3796194
|
am 8452422b: am 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"
* commit '8452422ba1f669615a196d15f8ae700a653681f6':
|
2013-10-03 16:12:38 -07:00 |
|
Tadashi G. Takaoka
|
4aef55d9ce
|
am 684732a1: am 3f75c760: am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package
* commit '684732a15aeb88dd3a6eb14929423154545cea14':
|
2013-10-03 16:12:35 -07:00 |
|
Tadashi G. Takaoka
|
93d9f1b250
|
am 393cb4d9: am 8fa567c7: am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit '393cb4d9b7cd4ddc0a86ac39da36cc577ee16334':
|
2013-10-03 16:12:33 -07:00 |
|
Tadashi G. Takaoka
|
3ef35fe37a
|
am 23e27aae: am 99771a81: am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
* commit '23e27aaee2fd7fddc9309803f19568c7c2a2bf1b':
|
2013-10-03 16:12:30 -07:00 |
|
Tadashi G. Takaoka
|
d43c17f155
|
am 7bb1019d: am 019ea417: am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '7bb1019d663f06bf26bc1a79e561cd90a1dbd284':
|
2013-10-03 16:12:28 -07:00 |
|
Ken Wakasa
|
89356a2bd9
|
am d1090278: am 26aed3a5: am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code
* commit 'd1090278019fde97a8c18bc81e8c3745be3afea8':
|
2013-10-03 16:12:26 -07:00 |
|
Ken Wakasa
|
6ce09940f9
|
am 9147aa06: am e7726dea: am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit '9147aa066134edc5ec6f9720b4a276863b7ffdd0':
|
2013-10-03 16:12:24 -07:00 |
|
Kurt Partridge
|
990a9b3355
|
am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit '2953da4fa33862591b74e07e7f387821e2bf3bea':
|
2013-10-03 16:12:21 -07:00 |
|
Baligh Uddin
|
07b8386862
|
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 '2159d77e7fe01bd9d80b2bf37dc4aa3bbcebf0cc':
|
2013-10-03 16:12:19 -07:00 |
|
The Android Open Source Project
|
68b247d894
|
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 'd193881971ff57e2d883ada35ad7384ac845be57':
|
2013-10-03 16:12:17 -07:00 |
|
Tadashi G. Takaoka
|
d19697b011
|
am 599e9481: am 71159b59: am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '599e9481f0e40a5cb84b9938e1460c757a77c14c':
|
2013-10-03 16:12:14 -07:00 |
|
Kurt Partridge
|
e0a874f9b9
|
am 43d56da0: am 6e619633: am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '43d56da07f08e500e9994a4276b7b89879a0dc6a':
|
2013-10-03 16:12:12 -07:00 |
|
Ken Wakasa
|
eccd780e42
|
am 682edd51: am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '682edd51c196bde8aa790538bbe81d77ee96b204':
|
2013-10-03 16:12:09 -07:00 |
|
Satoshi Kataoka
|
bd05c5e772
|
am 728217a6: am cd42b44e: am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit '728217a6e1a26af320cc3e47feaf68afa2967e65':
|
2013-10-03 16:12:06 -07:00 |
|
Ken Wakasa
|
4f4ac50a3c
|
am 0d3d4f4a: am 54415777: am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '0d3d4f4a0fe8b65829b273de0bec585342099282':
|
2013-10-03 16:12:04 -07:00 |
|
Satoshi Kataoka
|
6b57cd1a07
|
am ef8e1ead: am 19ae94c7: am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit 'ef8e1ead6e140136bb61c18cf516fd3de972cd80':
|
2013-10-03 16:12:01 -07:00 |
|
Tadashi G. Takaoka
|
1fa7277a94
|
am d15f772b: am a946ab7a: am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'd15f772bc086762cfecf083a38dc8b2753aa18e3':
|
2013-10-03 16:11:59 -07:00 |
|
Satoshi Kataoka
|
685776a7b8
|
am 2884dabe: am b6c875f6: am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit '2884dabefe8341b592eef39cda47cf7e57b8622e':
|
2013-10-03 16:11:56 -07:00 |
|
Satoshi Kataoka
|
52776463b8
|
am 560efcc9: am 039cef26: am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit '560efcc9a409075cf9b8ac51ec571d60a6cd22ad':
|
2013-10-03 16:11:54 -07:00 |
|
Tadashi G. Takaoka
|
71e6182a54
|
am 98ee25da: am 75a13052: am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '98ee25dac12fec65b8b0566ed5b289fa0f35a6f3':
|
2013-10-03 16:11:52 -07:00 |
|
Satoshi Kataoka
|
445183d2bc
|
am 6141f237: am 4b4edf8f: am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '6141f237bf2596686a5ed09313b2a8ca42d51809':
|
2013-10-03 16:11:49 -07:00 |
|
Satoshi Kataoka
|
bf13266353
|
am d5ba7513: am d13a713a: am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'd5ba7513cc4966e683b853d63dd44b32f8b36e2c':
|
2013-10-03 16:11:47 -07:00 |
|
Satoshi Kataoka
|
27c4787729
|
am 0047bea0: am b6efea52: am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit '0047bea08cd61f6f7707c41a7aa0c53bf9ff9f07':
|
2013-10-03 16:11:46 -07:00 |
|
Jean Chalard
|
8c35265a23
|
am 014b05f3: am 7f6ee228: am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '014b05f33d34706be6751cdb7e785028e5444b74':
|
2013-10-03 16:11:43 -07:00 |
|
Satoshi Kataoka
|
e5d5825448
|
am a7ecf8c3: am 10876211: am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit 'a7ecf8c31eb7b814d81d5ce2aa2639b99ab40914':
|
2013-10-03 16:11:40 -07:00 |
|
Tadashi G. Takaoka
|
68966f90f7
|
am ddc57756: am f952acee: am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit 'ddc57756a1a201e46c173ed578d2dd0adf10dc65':
|
2013-10-03 16:11:38 -07:00 |
|
Kurt Partridge
|
d85afb5735
|
am a2b94101: am a6b1c601: am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit 'a2b94101e7d1635d21361278289384f38c16928a':
|
2013-10-03 16:11:35 -07:00 |
|
Satoshi Kataoka
|
e586baf732
|
am 36cfd857: am c613917f: am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit '36cfd857dd9c517bb9b6bb70960b904cd06a7d67':
|
2013-10-03 16:11:33 -07:00 |
|
Ken Wakasa
|
50616095cc
|
am ee119b18: am d1042932: am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit 'ee119b184ed8d980006758dcff09b74805f71db6':
|
2013-10-03 16:11:30 -07:00 |
|
Kurt Partridge
|
9130d28848
|
am 8690602b: am 1fb6e4a3: am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit '8690602b5155719d8e710da59f2ff80b5e72ccbd':
|
2013-10-03 16:11:27 -07:00 |
|
Kurt Partridge
|
be5baa546b
|
am ae37582d: am 3b77d996: am 389a4da0: am 41da00d3: am 173ac0c6: am 74330288: Merge "Uncommit separator LogUnits"
* commit 'ae37582d551fa151bc1917f73d2815694fc9e2f5':
|
2013-10-03 16:11:25 -07:00 |
|
Kurt Partridge
|
f084607690
|
am 7c943ec2: am cfe54354: am 25f302a1: am 84e4a9bf: am a856138c: am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
* commit '7c943ec2f2327de4934719bdcef1bc97c0fb3499':
|
2013-10-03 16:11:23 -07:00 |
|
Kurt Partridge
|
724bf4c739
|
am 37f53939: am f2b30b6b: am 39eed879: am 4094dd7f: am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '37f5393913c1a5e394bdf6bbcb98aad77cf3aadc':
|
2013-10-03 16:11:21 -07:00 |
|
Ken Wakasa
|
aad63d0747
|
am 667e1f17: am 5b34dea0: am e34af095: am 1e1d2abd: am fe712a29: am f497e1e5: Move suggest_options.h to suggest/core
* commit '667e1f177230684f61636497f616b033de9b6738':
|
2013-10-03 16:11:18 -07:00 |
|
Keisuke Kuroyanagi
|
8d612c6522
|
am 66dc7e13: am 09b91a57: am 59bb6d0a: am 30de4e06: am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit '66dc7e13cc97218b322f36234d5eee9cd6d996b7':
|
2013-10-03 16:11:15 -07:00 |
|
Keisuke Kuroyanagi
|
5c935a1ec1
|
am 70cc03dc: am 96ca1fc9: am dc4b70b8: am c9fa8db0: am 12e2bd25: am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit '70cc03dc7adc420b3b93f222ec6db00973f0b9a4':
|
2013-10-03 16:11:13 -07:00 |
|
Baligh Uddin
|
a7bb36b398
|
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 '45eac3bc455f7051ce58d68a7267895ca270ce27':
|
2013-10-03 16:11:10 -07:00 |
|
Ken Wakasa
|
939dbccac7
|
am 249b21ca: am b509e43a: am 58c6f239: am e53f5b8a: am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit '249b21caf49c21aee4eb5ea499a78076d09236eb':
|
2013-10-03 16:11:07 -07:00 |
|
Jean Chalard
|
69fc3dcb1e
|
am 36f1d947: am 348ae75c: am 767011c0: am a8f8dab6: am f6a4670d: am 26f48949: Fix the displayed status after download
* commit '36f1d94722fc21d2104e784116ab2be6ae522e68':
|
2013-10-03 16:11:05 -07:00 |
|
Jean Chalard
|
83e1750bbb
|
am f3197a00: am 2aeea5fa: am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries from tests"
* commit 'f3197a00fd3e0d1a8a1aa2ab058c50fa45085325':
|
2013-10-03 16:11:02 -07:00 |
|
Tadashi G. Takaoka
|
723554323e
|
am b5d9016a: am a79e3b0b: am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
* commit 'b5d9016af81247ae180400d4f84d53d54d7d4527':
|
2013-10-03 16:11:00 -07:00 |
|