aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1fd6d5e1: am 97d69c2c: am 71454faf: am b7fbc964: am 3f557f6d: Merge "Fix: ↵Keisuke Kuroynagi2013-10-030-0/+0
|\ | | | | | | | | | | appendTwoWords cannot handle MAX_WORD_LENGTH-chars word." * commit '1fd6d5e12116d2d4d7151a64ed06df8d47dd626c':
| * am 97d69c2c: am 71454faf: am b7fbc964: am 3f557f6d: Merge "Fix: ↵Keisuke Kuroynagi2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | appendTwoWords cannot handle MAX_WORD_LENGTH-chars word." * commit '97d69c2c9c9599dc1e7ec6e79a9c9a54ee8f19f9':
| | * am 71454faf: am b7fbc964: am 3f557f6d: Merge "Fix: appendTwoWords cannot ↵Keisuke Kuroynagi2013-09-260-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | handle MAX_WORD_LENGTH-chars word." * commit '71454fafb672a9263fb6aa4f4bfc8f272c11d1d7':
| | | * am b7fbc964: am 3f557f6d: Merge "Fix: appendTwoWords cannot handle ↵Keisuke Kuroynagi2013-09-260-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | MAX_WORD_LENGTH-chars word." * commit 'b7fbc9648023df7a285271e72e8320ad0fc22880':
* | | | | am a680aea7: am a81fa3e3: am ef65b768: am befe69f5: am 310ea9ab: Remove ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sudden jump touch event hack * commit 'a680aea72e2dffd9969984dd881fcba455aadfe4':
| * | | | am a81fa3e3: am ef65b768: am befe69f5: am 310ea9ab: Remove sudden jump touch ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | event hack * commit 'a81fa3e32cc189abf6aee6cbc5e7900fa18e6a43':
| | * | | am ef65b768: am befe69f5: am 310ea9ab: Remove sudden jump touch event hackTadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'ef65b768519e0dec7e98aaa5f64f8c683e0b5fb7':
| | | * | am befe69f5: am 310ea9ab: Remove sudden jump touch event hackTadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | * commit 'befe69f589c587eb54c487afcd6b5ce9cf944fd5':
* | | | | | am 9aaaa331: am 7185a4f2: am 3a923ff0: am 53d41537: am 3b5c05f1: Merge "Fix ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catalan keyboard layout" * commit '9aaaa331973633afc699b482fae9ff58a01081f2':
| * | | | | am 7185a4f2: am 3a923ff0: am 53d41537: am 3b5c05f1: Merge "Fix Catalan ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard layout" * commit '7185a4f2c086522e8ed37a2ad622f97ae46b2de9':
| | * | | | am 3a923ff0: am 53d41537: am 3b5c05f1: Merge "Fix Catalan keyboard layout"Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | * commit '3a923ff0d0dae1058bc553e69be37669e1a7666e':
| | | * | | am 53d41537: am 3b5c05f1: Merge "Fix Catalan keyboard layout"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * commit '53d415370b067231d3e0e954f2b933ac5c84ed3a':
* | | | | | | am ce0e726e: am a78e301a: am 88c7e811: am 5e2e2862: am fea0862c: Merge "Fix ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing Azerbaijani text resource" * commit 'ce0e726e8fc628dced3817f35fe14a11708895f8':
| * | | | | | am a78e301a: am 88c7e811: am 5e2e2862: am fea0862c: Merge "Fix missing ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Azerbaijani text resource" * commit 'a78e301aed6881df1ad128966fa9e53450d1d712':
| | * | | | | am 88c7e811: am 5e2e2862: am fea0862c: Merge "Fix missing Azerbaijani text ↵Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource" * commit '88c7e81138344a5c56028c92402b1570c38aff8b':
| | | * | | | am 5e2e2862: am fea0862c: Merge "Fix missing Azerbaijani text resource"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e2e2862901bcb9c98df5bdf82cea86cc59da3c7':
* | | | | | | | am de6e35bc: am e40d6752: am 6554f4d7: am 5cc606ac: am 8d46ea91: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some warnings" * commit 'de6e35bc483545c8b33812b763cdcc542daa4fef':
| * | | | | | | am e40d6752: am 6554f4d7: am 5cc606ac: am 8d46ea91: Merge "Fix some warnings"Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e40d67521294bdcc32d02fa817dbaed54da9271f':
| | * | | | | | am 6554f4d7: am 5cc606ac: am 8d46ea91: Merge "Fix some warnings"Jean Chalard2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6554f4d75401bd13ca740f80d9bfee26aa46f0e9':
| | | * | | | | am 5cc606ac: am 8d46ea91: Merge "Fix some warnings"Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cc606aca6e5fc8848f7b1e69a97bfaaaae93f93':
* | | | | | | | | am daf351f2: am 3c5622c4: am 8c9c9024: am 81fb25ae: am 7d654d8c: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inconsistency with mutable settings." * commit 'daf351f2c686450bb7d81d43471ef1297f89116e':
| * | | | | | | | am 3c5622c4: am 8c9c9024: am 81fb25ae: am 7d654d8c: Merge "Fix inconsistency ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with mutable settings." * commit '3c5622c4dd8afcbe2f625a475d4bcf6640b6eed2':
| | * | | | | | | am 8c9c9024: am 81fb25ae: am 7d654d8c: Merge "Fix inconsistency with mutable ↵Jean Chalard2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." * commit '8c9c902403da61c03aed59ea70928cd506d5de34':
| | | * | | | | | am 81fb25ae: am 7d654d8c: Merge "Fix inconsistency with mutable settings."Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81fb25aeb7738d3807f54227fe47b97783ab2af6':
* | | | | | | | | | am cd145a0d: am 3d7f8c10: am 2060469d: am afa97875: am 21cabc98: Merge "Fix ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicated apostrophe on AZERTY/tablet" * commit 'cd145a0de6ff12e0948720429dc0438ac26f861d':
| * | | | | | | | | am 3d7f8c10: am 2060469d: am afa97875: am 21cabc98: Merge "Fix duplicated ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apostrophe on AZERTY/tablet" * commit '3d7f8c1081ebcda0fd0fdacba8fe5b5dd8c821b7':
| | * | | | | | | | am 2060469d: am afa97875: am 21cabc98: Merge "Fix duplicated apostrophe on ↵Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AZERTY/tablet" * commit '2060469de5ffd0b99e9ac20164dd301a517b3b8f':
| | | * | | | | | | am afa97875: am 21cabc98: Merge "Fix duplicated apostrophe on AZERTY/tablet"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afa978757343b4467564d059e50eccf26ef69f8a':
* | | | | | | | | | | am 743b7022: am f6f57018: am 6b1f9dbb: am 151a5683: am 536e0c79: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Clean up PointerTracker a bit" * commit '743b70229ab01c026a92ddb44c7a21a16a325408':
| * | | | | | | | | | am f6f57018: am 6b1f9dbb: am 151a5683: am 536e0c79: Merge "Clean up ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PointerTracker a bit" * commit 'f6f57018eeee9930486fa8bb703814546405511d':
| | * | | | | | | | | am 6b1f9dbb: am 151a5683: am 536e0c79: Merge "Clean up PointerTracker a bit"Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b1f9dbbb9248bd0c46618db990b1e42c6dd9a6d':
| | | * | | | | | | | am 151a5683: am 536e0c79: Merge "Clean up PointerTracker a bit"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '151a5683e88b6160c642aea8208426085a965e92':
* | | | | | | | | | | | am 66a443d8: am ea56a400: am 85de2782: am 740cb9d2: am 561c4474: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a problem where settings were not renewed correctly." * commit '66a443d89b479f44eacce98346f6176e273c083f':
| * | | | | | | | | | | am ea56a400: am 85de2782: am 740cb9d2: am 561c4474: Merge "Fix a problem ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where settings were not renewed correctly." * commit 'ea56a400f00e24fc16b17c0d2180cf288d8c65ff':
| | * | | | | | | | | | am 85de2782: am 740cb9d2: am 561c4474: Merge "Fix a problem where settings ↵Jean Chalard2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | were not renewed correctly." * commit '85de2782f69b0eeac3eee89a4aa5aef95a770b9e':
| | | * | | | | | | | | am 740cb9d2: am 561c4474: Merge "Fix a problem where settings were not ↵Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renewed correctly." * commit '740cb9d29cd30522103ed9e97134a4ba995af340':
* | | | | | | | | | | | | am f8bc2934: am 0ab4f686: am 570ac319: am 37d17ab2: am f8c1aefd: Merge ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Clarify the expected cursor position in RichInputConnection." * commit 'f8bc2934f6a05454d6d58d55f3dcc6a5596b09d7':
| * | | | | | | | | | | | am 0ab4f686: am 570ac319: am 37d17ab2: am f8c1aefd: Merge "Clarify the ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected cursor position in RichInputConnection." * commit '0ab4f686ae59d2709091335092626e781fec984b':
| | * | | | | | | | | | | am 570ac319: am 37d17ab2: am f8c1aefd: Merge "Clarify the expected cursor ↵Jean Chalard2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position in RichInputConnection." * commit '570ac31922a721df24fb24ced1524ad9e9ff22e5':
| | | * | | | | | | | | | am 37d17ab2: am f8c1aefd: Merge "Clarify the expected cursor position in ↵Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputConnection." * commit '37d17ab210f7019c0d2d784a5f1e37b31334678e':
* | | | | | | | | | | | | | am 5793925a: (-s ours) am c9eb6832: (-s ours) am 9a756eb7: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db8d2247: (-s ours) am e9087931: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '5793925a74ba384aa5d4624ad275c713c4772b64':
| * | | | | | | | | | | | | am c9eb6832: (-s ours) am 9a756eb7: (-s ours) am db8d2247: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9087931: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'c9eb68321e0c8019a199f7561d61f967a5a0a4c7':
| | * | | | | | | | | | | | am 9a756eb7: (-s ours) am db8d2247: (-s ours) am e9087931: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '9a756eb7792badc84d0978a7a0c5591cf3ef02c7':
| | | * | | | | | | | | | | am db8d2247: (-s ours) am e9087931: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit 'db8d2247fa02f7e10ba3e57c7ae55e80a3fae705':
* | | | | | | | | | | | | | | am b1390563: am 3e0bc7ea: am 1ed025d4: am 607d35cc: am 323a7aae: Merge "Fix ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the title of the personal dictionary settings" * commit 'b13905631a46b76b43848f807616cdc29ed9a0bb':
| * | | | | | | | | | | | | | am 3e0bc7ea: am 1ed025d4: am 607d35cc: am 323a7aae: Merge "Fix the title of ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the personal dictionary settings" * commit '3e0bc7ea546aba0bef06edd8df21689791f31bdd':
| | * | | | | | | | | | | | | am 1ed025d4: am 607d35cc: am 323a7aae: Merge "Fix the title of the personal ↵Satoshi Kataoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary settings" * commit '1ed025d430df60374bce7e8c3f2fcddb0c3e5166':
| | | * | | | | | | | | | | | am 607d35cc: am 323a7aae: Merge "Fix the title of the personal dictionary ↵Satoshi Kataoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings" * commit '607d35ccd893ec68e8baf572ca20e7325c3c07b5':
* | | | | | | | | | | | | | | | am 37eafaab: am 986f7826: am e4a78d94: am e71d9ab6: am ab2d2731: Merge "Fix ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the displayed name of the personal dictionary" * commit '37eafaab6c1cdedb8325352216a89c4ed91a243f':
| * | | | | | | | | | | | | | | am 986f7826: am e4a78d94: am e71d9ab6: am ab2d2731: Merge "Fix the displayed ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name of the personal dictionary" * commit '986f7826651cc41d1c73a13261642adb25b57b8e':