aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long ↵Tadashi G. Takaoka2013-09-260-0/+0
|\ | | | | | | | | | | press shift key" * commit '30183b22d20294bb9e9ed25740a2ad4e005ff894':
| * am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"Tadashi G. Takaoka2013-09-260-0/+0
| |\ | | | | | | | | | * commit 'e10f4b6b778298ecc78c1be53c0c1002be1f5f6c':
* | | am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related codeKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | * commit '49b9d16b8755bf45acebba85ee8d4977074d50eb':
| * | am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related codeKen Wakasa2013-09-260-0/+0
| |\ \ | | | | | | | | | | | | * commit '34a9e8bdfb101f2069a8a8156d10313a662b21db':
* | | | am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variablesKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | * commit '020a5704b67b3f9f05925456102b37497cee53d9':
| * | | am 496bb8af: am 11dc3a37: Clean up macro variablesKen Wakasa2013-09-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * commit '496bb8af8b641018742038fcd750a072b00449d2':
* | | | | am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '4865f81880d1b39e042b27406e725cb02866d855':
| * | | | am 0486b377: am 0dbae774: Merge "Avoid an NPE"Kurt Partridge2013-09-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit '0486b377e74d592b722d2d490be34c8514781055':
* | | | | | am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '14a3c634ebfe743b6648c5cbc3902e38dcebb423':
| * | | | | am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '267928c9768256843eef15fc4bfc00298019a6ac':
* | | | | | | am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am ↵The Android Open Source Project2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '986911101e51d0a16032a937fb9c8fb9084f8e46':
| * | | | | | am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) ↵The Android Open Source Project2013-09-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not merge * commit '61adf61981ee203db6e3ac80e73297bdf2cb75f9':
* | | | | | | | am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | center suggestion is long" * commit '5834fbb979425804c8ad7c00e51d366d3584270d':
| * | | | | | | am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion is long" * commit '15aab5b1fe918c055502f26a4326bcb70d265bbd':
* | | | | | | | | am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dfaaae824aa474478e741155f31f0de3b7a9c1b':
| * | | | | | | | am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"Kurt Partridge2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afbaac36a88bf78d121be339898fdc90d075de81':
* | | | | | | | | | am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer used * commit '2f3ac8e8056b6f5cf13036e836ee55288f5ba25b':
| * | | | | | | | | am 3888cc24: am 156d3930: Remove a bunch macros that are no longer usedKen Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3888cc243d7f25b5d5b2cf57d0ca5833fe700d71':
* | | | | | | | | | | am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b09a3f32fb6562c39bd083069668a1fe2cc0c81':
| * | | | | | | | | | am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b593ec88ee086e9767f6422d27163306a64e4b77':
* | | | | | | | | | | | am b5cda658: am 887b635d: am 4caf5941: Follow up to ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I907150be994c4f9ffc030c063de521eeb177d3e1 * commit 'b5cda65825b70a92a8ac0249b4f8fec2129c5da6':
| * | | | | | | | | | | am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '887b635dc42ab2686b414650ffffe2e5c402de34':
* | | | | | | | | | | | | am 130e1f95: am 31bd7b17: am cbb1ee48: Fix buildSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '130e1f95f9a4be5ed0b1392e2fbc1004f80806c7':
| * | | | | | | | | | | | am 31bd7b17: am cbb1ee48: Fix buildSatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31bd7b17703e4f61525f40560028e732d4a7059a':
* | | | | | | | | | | | | | am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2beae9e53570cd68770e43f8dfbf7960f179683':
| * | | | | | | | | | | | | am adf68c58: am b4ae86f0: Merge "Rename methods for readability"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adf68c5828d1647680113a99c6b77e8b920da0af':
* | | | | | | | | | | | | | | am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionarySatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b65bee7a4db99aea6a0f1b3173d6e9508f4e0b7b':
| * | | | | | | | | | | | | | am f4f547f0: am dceebee4: Purge UnigramDictionarySatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4f547f0e7874526d5b02126a3c01cca17534af6':
* | | | | | | | | | | | | | | | am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in ↵Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnigramDicitonary" * commit '6d811db75b8d770c2b7a1b59c55052b1c0d3cee7':
| * | | | | | | | | | | | | | | am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8335703d404ec98a4971f7fde577a8f239391c5':
* | | | | | | | | | | | | | | | | am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when gesture typing starts" * commit '9edecd76c88457567ec27f7a76b2566ce9226e46':
| * | | | | | | | | | | | | | | | am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typing starts" * commit '3e543e27259144d63a5d18074724f299e096af49':
* | | | | | | | | | | | | | | | | | am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33bb4fa5d0c52aed123e7f6e5afbb602ffedbf46':
| * | | | | | | | | | | | | | | | | am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7974e8c270bdae90ab40bdf216730a3ce8b7056':
* | | | | | | | | | | | | | | | | | | am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix buildSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e82cfe1fac3bde803d5262899779f7e0f31e398f':
| * | | | | | | | | | | | | | | | | | am 9b5d603e: am e0bbb98d: Fix buildSatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b5d603e17b1bae2d8619110f24c5777c92fd7fa':
* | | | | | | | | | | | | | | | | | | | am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dirSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdf85ea5c5fe627782d20c1fa0c2b6a7926a16be':
| * | | | | | | | | | | | | | | | | | | am b4379f9c: am 01cae939: Move obsolete files to obsolete dirSatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4379f9c485b3872388d4c5de517c9c93ce3a231':
* | | | | | | | | | | | | | | | | | | | | am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1f39730bfc02a044914eab580b0ac7f000a51ae':
| * | | | | | | | | | | | | | | | | | | | am 994b2858: am 3b94fd7b: Merge "Update dictionaries"Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '994b285875181469c8e19338becabc147781bd0c':
* | | | | | | | | | | | | | | | | | | | | | am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapperSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4fa26812dc90c74cf545f7c20a8d439d3ce30b4':
| * | | | | | | | | | | | | | | | | | | | | am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapperSatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26ae9aa8488071b85aa95fe43ff7fef6862197ed':
* | | | | | | | | | | | | | | | | | | | | | | am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4eb8117d1a7f0c28cf14b3dd0df240c18055c212':
| * | | | | | | | | | | | | | | | | | | | | | am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6b7cd3524f8df3d011632392cd3b302269d5fa1':
* | | | | | | | | | | | | | | | | | | | | | | | am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15f3de266e67cd4a4a257a0c07f1815794bdddba':
| * | | | | | | | | | | | | | | | | | | | | | | am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"Kurt Partridge2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '420532cc3aae2e68ce266e135178c5e0e8d88c8b':
* | | | | | | | | | | | | | | | | | | | | | | | | am 52831bac: am b13b977d: am d1811204: Move bigram_dictionarySatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52831bacdf60284af3f373325171d1a34b05bf23':
| * | | | | | | | | | | | | | | | | | | | | | | | am b13b977d: am d1811204: Move bigram_dictionarySatoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b13b977ddd7bc1b6d811812cebbbf29c825db06c':
* | | | | | | | | | | | | | | | | | | | | | | | | | am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa512f24009d6cec0320c1a06d4e212e3f1a9cb7':
| * | | | | | | | | | | | | | | | | | | | | | | | | am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67942c485017840631ee5694814402aceccc426c':