The Android Open Source Project
|
680f5e14d4
|
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 '24bf247553eb5358249006350fd577d12ae3a8e5':
|
2013-10-03 11:41:44 -07:00 |
|
Baligh Uddin
|
7a8ea815cd
|
am bc1ad68e: (-s ours) am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'bc1ad68e153401d5fb876880a99a30809866cd4c':
|
2013-10-03 11:41:42 -07:00 |
|
Satoshi Kataoka
|
2e5e3edd16
|
am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"
* commit 'd0fb2b4164e990904d07fbc645b5ea760a980726':
|
2013-10-03 11:41:38 -07:00 |
|
Tadashi G. Takaoka
|
81e36c3c35
|
am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit '0800da99d8e7063b7b1366cbbd9ab2d9809efe88':
|
2013-10-03 11:41:35 -07:00 |
|
Tadashi G. Takaoka
|
3edb2b8b13
|
am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"
* commit '8f4ed0b899d305c905dc67bcc33cecd614bb5028':
|
2013-10-03 11:41:31 -07:00 |
|
Jean Chalard
|
450e3af112
|
am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"
* commit '76c87e8cb8a031483c8001a6176e70fe6ffeee0d':
|
2013-10-03 11:41:27 -07:00 |
|
Tadashi G. Takaoka
|
e87c22fa7a
|
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 '8f5921bf5d9e175a1e919e412dfd4157b3156003':
|
2013-10-03 11:41:23 -07:00 |
|
Tadashi G. Takaoka
|
3872c243f2
|
am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"
* commit 'b2a1851523d7e715f077c0326d06153392e69ad7':
|
2013-10-03 11:41:21 -07:00 |
|
Jean Chalard
|
f022548eec
|
am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
* commit '37a44353faddec1a40579385c856ab2bbb8d8173':
|
2013-10-03 11:41:15 -07:00 |
|
Satoshi Kataoka
|
21f21877db
|
am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"
* commit '9b91243f4a64f9c8f8793ddfc2653d007d64c057':
|
2013-10-03 11:41:13 -07:00 |
|
Tadashi G. Takaoka
|
3f75c7609f
|
am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package
* commit 'b8d0dad0863fc685ef0d0cb856304b19c5534d47':
|
2013-10-03 11:41:10 -07:00 |
|
Tadashi G. Takaoka
|
8fa567c790
|
am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit '8b4fad975e31a8054259c76916c7b03353eab9ac':
|
2013-10-03 11:41:08 -07:00 |
|
Tadashi G. Takaoka
|
99771a81bd
|
am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
* commit '0dd57b18beee4f8fc562fc0d43e7059aff52dc59':
|
2013-10-03 11:41:04 -07:00 |
|
Tadashi G. Takaoka
|
019ea4170d
|
am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '7a4c7d0583ded5b9e260d41cb15bb507c504fcb1':
|
2013-10-03 11:41:01 -07:00 |
|
Ken Wakasa
|
26aed3a5d7
|
am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code
* commit '33ec5357ed67d3f379dc12ef19400b0ca2d3a861':
|
2013-10-03 11:40:58 -07:00 |
|
Ken Wakasa
|
e7726dea85
|
am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit '23fe55d0f4a61d42d6d0d6079081325ed967d24c':
|
2013-10-03 11:40:55 -07:00 |
|
Kurt Partridge
|
a6c275c139
|
am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit 'e8be6f74fe698e23360b7f6d42f264ae1c23fe13':
|
2013-10-03 11:40:52 -07:00 |
|
Baligh Uddin
|
5a6bcbfb6f
|
am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '3c6d51010855ea053b6a7ee107fd85996427a434':
|
2013-10-03 11:40:49 -07:00 |
|
The Android Open Source Project
|
d55e661e88
|
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 '3392102c3c0cdc638de96ed1584ee772ccf097c4':
|
2013-10-03 11:40:46 -07:00 |
|
Tadashi G. Takaoka
|
71159b59c8
|
am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '3c3d84043330219be0d0913263135fe09835ea3e':
|
2013-10-03 11:40:44 -07:00 |
|
Kurt Partridge
|
6e61963369
|
am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '28b85db81147d21461cdb9ebdfc1edca17d56a5c':
|
2013-10-03 11:40:41 -07:00 |
|
Ken Wakasa
|
be181a227c
|
am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '8cc42f326a3946f21bfceef5999146ea2266de3f':
|
2013-10-03 11:40:38 -07:00 |
|
Satoshi Kataoka
|
cd42b44e30
|
am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit 'b783f3b035a9dcacb83537cc2ca69d2a8cddf9a7':
|
2013-10-03 11:40:35 -07:00 |
|
Ken Wakasa
|
544157770c
|
am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '9ca395b7d60588ace440b581738f24a876169b8d':
|
2013-10-03 11:40:33 -07:00 |
|
Satoshi Kataoka
|
19ae94c75a
|
am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit 'b0e02abb1b7c57b4eedab2fd4fe64e8f6269c805':
|
2013-10-03 11:40:29 -07:00 |
|
Tadashi G. Takaoka
|
a946ab7abd
|
am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'ea632ca24e97bb6f2dd5314cddd373078232fb1b':
|
2013-10-03 11:40:27 -07:00 |
|
Satoshi Kataoka
|
b6c875f6a5
|
am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit '8fae970781bd9f9b78646c2dac561279a3f6b845':
|
2013-10-03 11:40:24 -07:00 |
|
Satoshi Kataoka
|
039cef260d
|
am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit '62efdff2c7a540773e8c89e19bdd158e75859744':
|
2013-10-03 11:40:21 -07:00 |
|
Tadashi G. Takaoka
|
75a130523f
|
am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '5935d961f97384617f307fe9c078c23b0517d555':
|
2013-10-03 11:40:19 -07:00 |
|
Satoshi Kataoka
|
4b4edf8fd6
|
am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '436a6c499aed8ddb5137a5192816ea2944092a29':
|
2013-10-03 11:40:17 -07:00 |
|
Satoshi Kataoka
|
d13a713a7c
|
am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'b6d60e290179de6977a70f099b80fe35ef7cd647':
|
2013-10-03 11:40:14 -07:00 |
|
Satoshi Kataoka
|
b6efea52b9
|
am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit '75647fb93a3b4db0758b6b5e959925ef6e6e77a1':
|
2013-10-03 11:40:11 -07:00 |
|
Jean Chalard
|
7f6ee228c8
|
am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '8d30f47361307665009752a8e96af57158c4a266':
|
2013-10-03 11:40:07 -07:00 |
|
Satoshi Kataoka
|
1087621156
|
am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit '8397dbe6a988383deab7f563507431effa5e99e1':
|
2013-10-03 11:40:05 -07:00 |
|
Tadashi G. Takaoka
|
f952aceea4
|
am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit '79aca6082b00435d90c3ae96c70a843ba7cf2150':
|
2013-10-03 11:40:02 -07:00 |
|
Kurt Partridge
|
a6b1c6019a
|
am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit '26afe79542d5b702aeceaed464e50e4bc90f9591':
|
2013-10-03 11:39:59 -07:00 |
|
Satoshi Kataoka
|
c613917ff0
|
am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit 'db10c9a556c82332648e404aa46da6a3fd52c99f':
|
2013-10-03 11:39:56 -07:00 |
|
Ken Wakasa
|
d1042932d3
|
am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit '8ab03f1fac1742e552281ab2e33c46fd34779e00':
|
2013-10-03 11:39:53 -07:00 |
|
Kurt Partridge
|
1fb6e4a38f
|
am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit '4d65647248b4687c0ea0385d56f00571e7b6f8c3':
|
2013-10-03 11:39:50 -07:00 |
|
Kurt Partridge
|
3b77d99606
|
am 389a4da0: am 41da00d3: am 173ac0c6: am 74330288: Merge "Uncommit separator LogUnits"
* commit '389a4da08d9e638faaecc8fbfefffbb68557464b':
|
2013-10-03 11:39:47 -07:00 |
|
Kurt Partridge
|
cfe543545a
|
am 25f302a1: am 84e4a9bf: am a856138c: am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
* commit '25f302a12c2954e1a2d0fcacb23e33f7c40331d5':
|
2013-10-03 11:39:45 -07:00 |
|
Kurt Partridge
|
f2b30b6b9b
|
am 39eed879: am 4094dd7f: am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '39eed879c6b46d4ec1af38b0b29d14cf6e4860c5':
|
2013-10-03 11:39:39 -07:00 |
|
Ken Wakasa
|
5b34dea0d7
|
am e34af095: am 1e1d2abd: am fe712a29: am f497e1e5: Move suggest_options.h to suggest/core
* commit 'e34af0951d49e5d5e9c335b652b1092f4f961bee':
|
2013-10-03 11:39:36 -07:00 |
|
Keisuke Kuroyanagi
|
09b91a57cc
|
am 59bb6d0a: am 30de4e06: am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit '59bb6d0a67621913f36c893fd64253447af75d71':
|
2013-10-03 11:39:33 -07:00 |
|
Keisuke Kuroyanagi
|
96ca1fc963
|
am dc4b70b8: am c9fa8db0: am 12e2bd25: am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit 'dc4b70b86b20dc05e830dd8ab67f81d6f52cf8ae':
|
2013-10-03 11:39:30 -07:00 |
|
Baligh Uddin
|
66b22e904b
|
am 0b57d3b7: (-s ours) am 7ea32c70: (-s ours) am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '0b57d3b709fb3bcb1df93a4cf66d1941310b03b7':
|
2013-10-03 11:39:28 -07:00 |
|
Ken Wakasa
|
b509e43a43
|
am 58c6f239: am e53f5b8a: am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit '58c6f2398b659544dc9e94b8f24ae6d3753c0b78':
|
2013-10-03 11:39:25 -07:00 |
|
Jean Chalard
|
348ae75c44
|
am 767011c0: am a8f8dab6: am f6a4670d: am 26f48949: Fix the displayed status after download
* commit '767011c032c84d79bd1ee62837b6ba77c0635664':
|
2013-10-03 11:39:23 -07:00 |
|
Jean Chalard
|
2aeea5fa55
|
am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries from tests"
* commit '06cf0ee14979a92ce4ee3c241ef984a508eefe8e':
|
2013-10-03 11:39:20 -07:00 |
|
Tadashi G. Takaoka
|
a79e3b0b2a
|
am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
* commit 'd08fd7803cb5b6a9156e89a930d4ec35619829a8':
|
2013-10-03 11:39:16 -07:00 |
|