aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 872760d0: (-s ours) am 806a622b: am 30ca32de: am 6ed55278: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\ | | | | | | | | | | 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE * commit '872760d0911923f408006264376ee1e9cffeeb1b':
| * am 806a622b: am 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\ | | | | | | | | | | | | | | | ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE * commit '806a622b23358e7f6e206e90d72bd5b670bd2b1b':
| | * am 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | boundary checking for PtNode Array reading. DO NOT MERGE * commit '30ca32defc7f4b4fc124d9d39bfffaf298d09a81':
| | | * am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary ↵Keisuke Kuroyanagi2013-10-010-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | checking for PtNode Array reading. DO NOT MERGE * commit '6ed552780427cd7fb184a648c25e143e507741a7':
* | | | | am 55754a85: (-s ours) am 99ea6cbb: am 9de5ec25: am 49410adb: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE) * commit '55754a85366b49d1e0d36f1a62b5b03a2ca4440b':
| * | | | am 99ea6cbb: am 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE) * commit '99ea6cbb58870853372ab5eadf49910ba1ea2298':
| | * | | am 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | reading dictionary while regenerating. (DO NOT MERGE) * commit '9de5ec255f2fe9ccad8558e3d090f41a05660a54':
| | | * | am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading ↵Keisuke Kuroyanagi2013-10-010-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary while regenerating. (DO NOT MERGE) * commit '49410adb1be1071f3797616c43b9fb5ccb923005':
* | | | | | am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '472bace7dbb28a8691455fff265a2b0aaa511132':
| * | | | | am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reentrant lock for main dictionaries. DO NOT MERGE * commit '750fc3cb227be627af0f50f00ea19ef3a2f63673':
| | * | | | am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock for main dictionaries. DO NOT MERGE * commit 'eff90276f13fabe46bc59828e4db83fea85413a9':
| | | * | | am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main ↵Keisuke Kuroyanagi2013-10-010-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries. DO NOT MERGE * commit '9b9d17f99c2f1be7fbdf55a3b5403b865942beb7': Use reentrant lock for main dictionaries. DO NOT MERGE
* | | | | | | am 7a00c08c: am 183718f2: am d2265036: am f9ba073d: am ceb364c0: Fix ↵Yuichiro Hanada2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrioritizedSerialExecutor. * commit '7a00c08c6dd5b052b9e030efa3d27aeae1e57cba':
| * | | | | | am 183718f2: am d2265036: am f9ba073d: am ceb364c0: Fix ↵Yuichiro Hanada2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrioritizedSerialExecutor. * commit '183718f2762fa7616899770124c943c97f8f138a':
| | * | | | | am d2265036: am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd22650363c0eca3f232beaa6df4d164002bae3d4':
| | | * | | | am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9ba073d3b33344594578822edb7885fcc660fcf': Fix PrioritizedSerialExecutor.
* | | | | | | | am 777b078d: (-s ours) am 2e082f46: am e0547020: am a6095365: (-s ours) am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE * commit '777b078d75f8c9c841ea8f0d4770b36eb512a6c4':
| * | | | | | | am 2e082f46: am e0547020: am a6095365: (-s ours) am ef63947f: (-s ours) Add ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boundary checking for PtNode Array reading. DO NOT MERGE * commit '2e082f46aad2b2a6f6d0f9786fdb40bbe592077e':
| | * | | | | | am e0547020: am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking for PtNode Array reading. DO NOT MERGE * commit 'e0547020f13c3cde2bfca5665e8b289729c15de0':
| | | * | | | | am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary checking for ↵Keisuke Kuroyanagi2013-10-010-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PtNode Array reading. DO NOT MERGE * commit 'a6095365127546ab66574afe5e195972ad61b58b': Add boundary checking for PtNode Array reading. DO NOT MERGE
* | | | | | | | | am 9d527c02: am 2e7f74f0: am 615509cf: am 9d763910: Merge "Unfortunately, ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hide some broken "emoji"s" * commit '9d527c0225426717cdf83c8c2756a242f5b61290':
| * | | | | | | | am 2e7f74f0: am 615509cf: am 9d763910: Merge "Unfortunately, hide some ↵Satoshi Kataoka2013-10-093-26/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | broken "emoji"s" * commit '2e7f74f00cd6e9ba7e7be9ee1ba07ec0066ffe15': Unfortunately, hide some broken "emoji"s
| | * | | | | | | am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-093-26/+56
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '615509cf27839e946280787cf27d8c091079b91b': Unfortunately, hide some broken "emoji"s
| | | * | | | | | am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-013-26/+56
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d763910580379d3e68b4559f91e655cf05f02a3': Unfortunately, hide some broken "emoji"s
* | | | | | | | | | am e8c01167: am e398d09a: am af75e48e: am 74577bed: Merge "Implement the ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | heuristic for auto-commit." * commit 'e8c011679ae2bcc880902d86bc106f37f7d9136f':
| * | | | | | | | | am e398d09a: am af75e48e: am 74577bed: Merge "Implement the heuristic for ↵Jean Chalard2013-10-096-21/+90
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auto-commit." * commit 'e398d09a50486d1b91ce109f4bd1a7529560c634': Implement the heuristic for auto-commit.
| | * | | | | | | | am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-096-21/+90
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af75e48efdc5be7d0b1c3d411017757454ed1799': Implement the heuristic for auto-commit.
| | | * | | | | | | am 74577bed: Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-016-21/+90
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74577bedb3bb0dabd0e661270f9da0c11c4b0f46': Implement the heuristic for auto-commit.
* | | | | | | | | | | am e2598657: am 1f8eab7d: am a6e7c3ff: am ff9476f1: Merge "Fix typos"Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2598657c3b773ff23283b7f194a49a7d1482a70':
| * | | | | | | | | | am 1f8eab7d: am a6e7c3ff: am ff9476f1: Merge "Fix typos"Jean Chalard2013-10-096-19/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f8eab7d79f35d11162c45726b3ee95bbe7ad961': Fix typos
| | * | | | | | | | | am a6e7c3ff: am ff9476f1: Merge "Fix typos"Jean Chalard2013-10-096-19/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6e7c3ff29c2b9eaf406f96dd3ee44cafa293452': Fix typos
| | | * | | | | | | | am ff9476f1: Merge "Fix typos"Jean Chalard2013-10-016-19/+19
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff9476f10ae271aa6df87aadb8b2b9edfeeb8a1d': Fix typos
* | | | | | | | | | | | am dc674273: am 805bae95: am 6f2830dc: am 2afa0e62: Merge "Fix a bug where ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gesture would delay update." * commit 'dc674273aca7375c4647c8fb8248f637e0abdd44':
| * | | | | | | | | | | am 805bae95: am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would ↵Jean Chalard2013-10-091-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delay update." * commit '805bae9575809be17e61aa1f82e36c9f0d365ba7': Fix a bug where gesture would delay update.
| | * | | | | | | | | | am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-091-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6': Fix a bug where gesture would delay update.
| | | * | | | | | | | | am 2afa0e62: Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-011-2/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2afa0e621eab2ebd7e2bde344dd209308a75dcfc': Fix a bug where gesture would delay update.
* | | | | | | | | | | | | am 72b41953: am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove redundant more keys on phones" * commit '72b41953602690c14cf5fdcc0bcd8350d32bcd56':
| * | | | | | | | | | | | am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant ↵Ken Wakasa2013-10-098-28/+115
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more keys on phones" * commit '3dd818565676f8a08b4bd29ba4909b1593a1d924': Cleanup and remove redundant more keys on phones
| | * | | | | | | | | | | am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on ↵Ken Wakasa2013-10-098-28/+115
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phones" * commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176': Cleanup and remove redundant more keys on phones
| | | * | | | | | | | | | am 382094a7: Merge "Cleanup and remove redundant more keys on phones"Ken Wakasa2013-10-018-28/+115
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '382094a784efb32ef9308542ef2f8d2c88ac96b2': Cleanup and remove redundant more keys on phones
* | | | | | | | | | | | | | am 3d87eff7: am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exclamation, question, period, comma." * commit '3d87eff739304a788302b0250303370d3b85a8bd':
| * | | | | | | | | | | | | am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: exclamation, ↵Ken Wakasa2013-10-093-20/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | question, period, comma." * commit '272a8b79d81f77f244a9836f3d02516bb29063e5': Swap keys: exclamation, question, period, comma.
| | * | | | | | | | | | | | am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, ↵Ken Wakasa2013-10-093-20/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comma." * commit '88c946af0c8a8e07092be71a7b98957d021e499b': Swap keys: exclamation, question, period, comma.
| | | * | | | | | | | | | | am 194c6360: Merge "Swap keys: exclamation, question, period, comma."Ken Wakasa2013-10-013-20/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194c6360554f54d3dfa165427eadda2c7046a65e': Swap keys: exclamation, question, period, comma.
* | | | | | | | | | | | | | | am 1fa00902: am d5ff552c: am a231c2ab: am e89a179b: Merge "Separate "GC" and ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "GC with decay"." * commit '1fa00902b31e8ce12b1b78606cdd24815e7ce128':
| * | | | | | | | | | | | | | am d5ff552c: am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with ↵Keisuke Kuroyanagi2013-10-0913-32/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decay"." * commit 'd5ff552c9e5fe0bfcfd01d78dc8cd44d618981e4': Separate "GC" and "GC with decay".
| | * | | | | | | | | | | | | am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."Keisuke Kuroyanagi2013-10-0913-32/+77
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a231c2ab72e92a3f849c347bc46d3f8599547510': Separate "GC" and "GC with decay".
| | | * | | | | | | | | | | | am e89a179b: Merge "Separate "GC" and "GC with decay"."Keisuke Kuroyanagi2013-10-0113-32/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e89a179b1048eb7d9a2edba5c140d6219a85b056': Separate "GC" and "GC with decay".
* | | | | | | | | | | | | | | | am f7b2afdd: am b04568b4: am 1522e7be: am cc81a93b: Merge "Add skipPtNode to ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DictDecoders." * commit 'f7b2afdd82d6c98bc3cde22f126cc2129f74f00b':
| * | | | | | | | | | | | | | | am b04568b4: am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."Ken Wakasa2013-10-094-0/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b04568b460837c01f99cc04be81f10077b54c473': Add skipPtNode to DictDecoders.