aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix a small typoKen Wakasa2012-10-071-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I813d97b9453f8aa7aae99bd165336b1e5a81dc6a
| * | | | | | am eca0b552: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eca0b552dd93a3e24fe90f6e0cc014e808daffb8':
| | * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-050-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Change-Id: Ib69160e84d0803f668e62c9425a0b4e6480ab77b
| | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | am 595b9ea5: am 478605ba: am 448e7322: Follow up change for ↵Satoshi Kataoka2012-10-051-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I5f166a738f6e84a1b807be * commit '595b9ea54a21988ae4209779ac2dae9898aa43e2': Follow up change for I5f166a738f6e84a1b807be
| | * | | | | am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807beSatoshi Kataoka2012-10-051-4/+4
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '478605baa460d2d595c7ed0da2790b147727d284': Follow up change for I5f166a738f6e84a1b807be
| | | * | | | am 448e7322: Follow up change for I5f166a738f6e84a1b807beSatoshi Kataoka2012-10-051-4/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '448e732272bb3e55d649d2d5dd6a0acb9efdaec3': Follow up change for I5f166a738f6e84a1b807be
| | | | * | | Follow up change for I5f166a738f6e84a1b807beSatoshi Kataoka2012-10-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7283955 Change-Id: Iec716d75e7c8a727b198688f44ef4a8cd1255ec1
| * | | | | | am 49a90081: am a40f2842: am 78fe885f: Merge "Fix addtional proximity ↵Satoshi Kataoka2012-10-051-12/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correction" into jb-mr1-dev * commit '49a90081ebaef2e34ea4bb10588b9b0a6e09062c': Fix addtional proximity correction
| | * | | | | am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into ↵Satoshi Kataoka2012-10-051-12/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'a40f2842cf9ed085703518ed16ddd9e9f66560da': Fix addtional proximity correction
| | | * | | | am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-devSatoshi Kataoka2012-10-051-12/+12
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78fe885fb3fcea85e5522ae7a09d12febaca9ba7': Fix addtional proximity correction
| | | | * | | Merge "Fix addtional proximity correction" into jb-mr1-devSatoshi Kataoka2012-10-051-12/+12
| | | | |\ \ \
| | | | | * | | Fix addtional proximity correctionSatoshi Kataoka2012-10-051-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3125764b98af28ce423dc12cbf0dac321ef22386
| * | | | | | | am d7345ed0: am d34422f1: am 3623b976: Fix detecting fast typing algorithm ↵Tadashi G. Takaoka2012-10-055-22/+101
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and parameter * commit 'd7345ed0b532eaa2082adea6fb5e89f5fe0acb86': Fix detecting fast typing algorithm and parameter
| | * | | | | | am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameterTadashi G. Takaoka2012-10-055-22/+101
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd34422f1b2168346c1ebb230db0238680baafacb': Fix detecting fast typing algorithm and parameter
| | | * | | | | am 3623b976: Fix detecting fast typing algorithm and parameterTadashi G. Takaoka2012-10-055-22/+101
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3623b9767b3d5f122f574d4c4d14aa79ed305752': Fix detecting fast typing algorithm and parameter
| | | | * | | | Fix detecting fast typing algorithm and parameterTadashi G. Takaoka2012-10-055-22/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7032858 Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
| * | | | | | | Make unit tests create temporary files in the cache directory.Yuichiro Hanada2012-10-053-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90791b364b441bc4e8e221d9e668372d15591719
| * | | | | | | Merge "fix writeCharGroup."Ken Wakasa2012-10-042-21/+106
| |\ \ \ \ \ \ \
| | * | | | | | | fix writeCharGroup.Yuichiro Hanada2012-10-052-21/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib841afaba0a20c3b300eb7d3e9133243f9f3ae58
| * | | | | | | | am 24ebf7da: am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and ↵Tadashi G. Takaoka2012-10-046-46/+149
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recognition paramters to resources" into jb-mr1-dev * commit '24ebf7da9853f2975bf1ae3e11c0cf1962236667': Move gesture detection and recognition paramters to resources
| | * | | | | | | am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition ↵Tadashi G. Takaoka2012-10-046-46/+149
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paramters to resources" into jb-mr1-dev * commit 'b02fc3fcdf47796c9e4101b7fee6e77a9b9cdc0f': Move gesture detection and recognition paramters to resources
| | | * | | | | | am 4580b7e4: Merge "Move gesture detection and recognition paramters to ↵Tadashi G. Takaoka2012-10-046-46/+149
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources" into jb-mr1-dev * commit '4580b7e457db1cace972ce89bd04542ebfe08845': Move gesture detection and recognition paramters to resources
| | | | * | | | | Merge "Move gesture detection and recognition paramters to resources" into ↵Tadashi G. Takaoka2012-10-046-46/+149
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | | | * | | | | Move gesture detection and recognition paramters to resourcesTadashi G. Takaoka2012-10-056-46/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7032858 Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
| * | | | | | | | | am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. ↵Baligh Uddin2012-10-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" into jb-mr1-dev * commit '2087e2961d41122360df4e0104c49bbc42c0f118': Import translations. DO NOT MERGE
| | * | | | | | | | am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'a7950f642bf195d74eb4ed3c579cb7810448d97e': Import translations. DO NOT MERGE
| | | * | | | | | | am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-040-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47417ec155c38140df51ddea7afd01174e37cea3': Import translations. DO NOT MERGE
| | | | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-042-4/+4
| | | | |\ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc0d44ee84d88674227a95bb5556a99a01eb3d30 Auto-generated-cl: translation import
| * | | | | | | | | am d1c36cff: (-s ours) am 3b17c7f3: Merge "Import translations. DO NOT ↵Baligh Uddin2012-10-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-mr1-aah-dev * commit 'd1c36cffa9689ed1ec88c1eb6c8d09f4ac49db51': Import translations. DO NOT MERGE
| | * | | | | | | | am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-042-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b17c7f3b45eb1c63bdedbdbd62de414f1a414e1': Import translations. DO NOT MERGE
| | | * | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-042-4/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dfcb0a0db782648b586d36cc5f293c05ebf7c8a Auto-generated-cl: translation import
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-10-042-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64e38d5f0be5a47923642af0bc0146765e094b77 Auto-generated-cl: translation import
| * | | | | | | | | | | am ddc81746: am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.Jean Chalard2012-10-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | * commit 'ddc8174657777ff3166e536fb8029a0a0b629481': Add notice for Lexiteria dictionaries.
| | * | | | | | | | | am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.Jean Chalard2012-10-041-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8cf110100b24ed6f968fca194a7090eafb8a9c1': Add notice for Lexiteria dictionaries.
| | | * | | | | | | | am 49d301e9: Add notice for Lexiteria dictionaries.Jean Chalard2012-10-041-0/+2
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49d301e9ad470a83048e0a5093cd88e54dd491be': Add notice for Lexiteria dictionaries.
| | | | * | | | | | | Add notice for Lexiteria dictionaries.Jean Chalard2012-10-051-0/+2
| | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7285172 Change-Id: Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4
| * | | | | | | | | am 933e7c37: am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before ↵Ken Wakasa2012-10-041-0/+1
| |\| | | | | | | | | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moving the new file over it" into jb-mr1-dev * commit '933e7c3770c00a9eea43c447d96daec1ada62041': Unlink an old file before moving the new file over it
| | * | | | | | | am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new ↵Ken Wakasa2012-10-041-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file over it" into jb-mr1-dev * commit '37c8f8b510a13b14a5e043a0735c91609917843d': Unlink an old file before moving the new file over it
| | | * | | | | | am 20f07e33: Merge "Unlink an old file before moving the new file over it" ↵Ken Wakasa2012-10-041-0/+1
| | | |\| | | | | | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '20f07e335df4155df2176e6124389a98e25aecf7': Unlink an old file before moving the new file over it
| | | | * | | | Merge "Unlink an old file before moving the new file over it" into jb-mr1-devKen Wakasa2012-10-041-0/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Unlink an old file before moving the new file over itJean Chalard2012-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unlikely to be relevant to this bug, but just in case. Bug: 7274972 Change-Id: I56b31b377af16cc2c15ceb90a19792bed3aab367
| * | | | | | | am ca9140bd: (-s ours) am e3748309: am 28989acb: Merge "Import translations. ↵Baligh Uddin2012-10-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" into jb-mr1-dev * commit 'ca9140bd135b84adaa070151cc6ba3e4b97942b1': Import translations. DO NOT MERGE
| | * | | | | | am e3748309: am 28989acb: Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'e374830943cf41ed824bea7e991ef63185725397': Import translations. DO NOT MERGE
| | | * | | | | am 28989acb: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-040-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28989acb9cb62f505e777e10efe1a60b4f80195d': Import translations. DO NOT MERGE
| | | | * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-0416-35/+35
| | | | |\ \ \ \
| | | | | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-0316-35/+35
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bbc24fdd81a547e25e66e07fd982fe949a19bcc Auto-generated-cl: translation import