aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge ↵Jean Chalard2013-04-170-0/+0
|\ | | | | | | | | | | "Offer to add any OOV typed word to the dictionary." * commit '9bca1daf7da46d5acea0316ea64da6af81e74083':
| * am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any ↵Jean Chalard2013-04-100-0/+0
| |\ | | | | | | | | | | | | | | | OOV typed word to the dictionary." * commit 'defd295068bfee8ed1037d086183154551000664':
| | * am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed ↵Jean Chalard2013-04-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | word to the dictionary." * commit '1aaaa64da8d818dd7a91c024eb4fa2d9e1459f93':
* | | | am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | touch coordinate calibration" * commit 'ea8c4731b917f4130de157b4a2d0db7fd8014b16':
| * | | am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | coordinate calibration" * commit 'd355283f568c5ab1d5b2a03bd141e305966f9097':
| | * | am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"Satoshi Kataoka2013-04-100-0/+0
| | |\ \ | | | | | | | | | | | | | | | * commit 'fd89cd20c956ce9618353dcd5d7648a2bab3b7ab':
* | | | | am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugs and add tests" * commit '41ac21dd2a9941b80385d16f8912abf8818aa4f7':
| * | | | am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | tests" * commit 'e040aa197ec718434fb3ceeb3d48493bd64adf08':
| | * | | am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"Jean Chalard2013-04-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit '0d72a23054341a8e216a33c0191cace1edc0cff9':
* | | | | | am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge ↵Kurt Partridge2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Allow logging while replaying" * commit '2f7ff3cf5c75f1bf0d7f1ef13fd9c80a9711eb50':
| * | | | | am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging ↵Kurt Partridge2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while replaying" * commit 'e2bdf6861a3c574da474658062123d3fe20e2175':
| | * | | | am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"Kurt Partridge2013-04-100-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'bea42fc5bd1e4053e7cf7a3a51021d771d939f97':
* | | | | | | am 5df602b0: am 1944521b: am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do ↵Kurt Partridge2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not record log split time when handling separator" * commit '5df602b02ba034902f4377c39b2b5aaad9ee31f5':
| * | | | | | am 1944521b: am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log ↵Kurt Partridge2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split time when handling separator" * commit '1944521bed0eaf203cfc44d99abf7aa4c489f4bc':
| | * | | | | am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log split time ↵Kurt Partridge2013-04-100-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when handling separator" * commit '41a049a410a921abdb896450abe3c6010a71d9e6':
* | | | | | | | am 3d399706: am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: ↵The Android Open Source Project2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge * commit '3d399706ca2fe0239d42adf827ff05b2e9c2ab27':
| * | | | | | | am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am ↵The Android Open Source Project2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5c8247f: Reconcile with jb-mr2-release - do not merge * commit 'c89354b9af6adea83ed254912e61e511366a08d9':
| | * | | | | | am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with ↵The Android Open Source Project2013-04-100-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-release - do not merge * commit 'fb899d85ee3497dbb9443fbbee0241aaf94f2e52':
* | | | | | | | | am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update commentsKen Wakasa2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1f51ca091ce11e669159e4c705ddea3c5782a08':
| * | | | | | | | am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update commentsKen Wakasa2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd01118aeba78ec711dfcc13259c9d01ace7112fa':
| | * | | | | | | am 4c896a2f: am f71b9640: am d17c8bd9: Update commentsKen Wakasa2013-04-100-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c896a2fe81748990786288eff28b00233423da9':
* | | | | | | | | | am 42eafd44: am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean ↵Ken Wakasa2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up in Makefile * commit '42eafd44ef5b3f22edc03bc78ba8b03e35faeb4e':
| * | | | | | | | | am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in MakefileKen Wakasa2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f55a951e9616e2bc2c8dea8b752ddde72af96c4':
| | * | | | | | | | am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in MakefileKen Wakasa2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa':
* | | | | | | | | | | am b0a7c47d: am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the ↵Ken Wakasa2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include paths * commit 'b0a7c47d28f9651b593eafd53ae11e4cd13b381a':
| * | | | | | | | | | am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include pathsKen Wakasa2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4d60a2db057cf850bda3c35bdf0c52996d48ca8':
| | * | | | | | | | | am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include pathsKen Wakasa2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff730a665cc90aec1c795c8555e8563ff1bfbc37':
* | | | | | | | | | | | am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bigram native log * commit 'a6e4ff7a3be816df90d6b82cd377a8c27618ce0e':
| * | | | | | | | | | | am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native logSatoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7d4f50233c0fe5e418a1808a2d211185813edd9':
| | * | | | | | | | | | am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native logSatoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7e1caac44238d53f635ee1660cb767d122b7416':
* | | | | | | | | | | | | am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Cleanup suggest interface" * commit 'f17c4e650885aa5d038666b77f51e397fa727920':
| * | | | | | | | | | | | am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface" * commit '23b62c93871df2448876ace96f36198914ae3451':
| | * | | | | | | | | | | am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40d8b652b2fce9246ad34b7f78719b83348136a7':
* | | | | | | | | | | | | | am b66b928a: am 1c9da7af: am 34cff46a: am ed8fd94e: am 370461ef: Clean up a ↵Ken Wakasa2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | few option strings under the Advanced settings * commit 'b66b928a96e5237d93e568f1b2ea7820dc03a2c4':
| * | | | | | | | | | | | | am 1c9da7af: am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option ↵Ken Wakasa2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings under the Advanced settings * commit '1c9da7af48f957c65471176c1a3074769ace5420':
| | * | | | | | | | | | | | am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under ↵Ken Wakasa2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Advanced settings * commit '34cff46a9ca4fc8bdd1d074b94597859bde08a4a':
* | | | | | | | | | | | | | | am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a generic string utility to StringUtils" * commit 'e4678cf9343ed02b8012bbb40d5c19a118a70030':
| * | | | | | | | | | | | | | am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string utility to StringUtils" * commit '8178241912dce7ae5e975c7e1f91795b3fb2c134':
| | * | | | | | | | | | | | | am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to StringUtils" * commit '024d0e4abf9d3bfacfb5495fa27a512c266df114':
* | | | | | | | | | | | | | | | am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add ↵Tom Ouyang2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DigraphUtils class" * commit '281b22bf0ad327fecf1f3ca47e2e550d35abdcc5':
| * | | | | | | | | | | | | | | am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils ↵Tom Ouyang2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class" * commit '3c15067b0e351b64e4c385c09b402623c8012afe':
| | * | | | | | | | | | | | | | am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"Tom Ouyang2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ab65b8b4eb5815398db8abb0a0dfc02f613445e':
* | | | | | | | | | | | | | | | | am 49273f43: am 76293949: am f82a5a24: am 96cb244d: am 65534ffc: am ↵Ben Cheng2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit '49273f43bb77244f4d7577ae23b7361336be05d0':
| * | | | | | | | | | | | | | | | am 76293949: am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am ↵Ben Cheng2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit '7629394953b639f52e9929aecb77c6e1d798be33':
| | * | | | | | | | | | | | | | | am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge ↵Ben Cheng2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit 'f82a5a24ccc6d9e8a77f49ebb1a58f64d174c59f':
* | | | | | | | | | | | | | | | | | am c086c111: am b3d7d07e: am e90df243: am 481412bb: am f3633e9b: Merge "Add ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag to turn on new suggest implementation for typing" * commit 'c086c1115932958bdc415bda095c6c9eebb2c256':
| * | | | | | | | | | | | | | | | | am b3d7d07e: am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on new suggest implementation for typing" * commit 'b3d7d07e5865fd6c9b72c5596009001b5dc1c59d':
| | * | | | | | | | | | | | | | | | am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggest implementation for typing" * commit 'e90df24386ca22689abccaacf70a087912c00343':
* | | | | | | | | | | | | | | | | | | am 90044aab: am 1270880e: am da90ffe0: am 898ec2bf: am 5a5db35d: am ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki * commit '90044aabfe01dc353a7711c98787c08af43e3af3':
| * | | | | | | | | | | | | | | | | | am 1270880e: am da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki * commit '1270880eaaf1e8724fc21099dd2bc81653846bd3':