aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bd21edc9: (-s ours) am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\ | | | | | | | | | | a009d2c9: Add HTC One special edition (DO NOT MERGE) * commit 'bd21edc977988060cc9ba75fe95edce42b809abe':
| * am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One ↵Tadashi G. Takaoka2013-06-060-0/+0
| |\ | | | | | | | | | | | | | | | | | | special edition (DO NOT MERGE) * commit '1665cc27f2a2f2e1c9b5a80c622aceed85a25283': Add HTC One special edition (DO NOT MERGE)
* | | am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | * commit '48f20fb8924cd93528bd60b2ad28b36386d636da':
| * | am 091a4532: Merge "Add HTC One special edition"Tadashi G. Takaoka2013-06-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '091a4532925ba9d35e83b60b834dcc88b1a4d2ea': Add HTC One special edition
* | | | am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | ArrayList." * commit '323dd492f05cdbef0957875d948f0e76b8e8fd5b':
| * | | am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."Jean Chalard2013-06-061-4/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6910032972524541314249fb2a6c2202ac813845': Use an iterator to remove stuff from an ArrayList.
* | | | | am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '2fa14bc54d7848224519294bb1b721f5764176a1':
| * | | | am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-06-051-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6a1a7652473778ff2e52754f29f7822a9b482db': Fix a possible NPE
* | | | | | am 596652cc: am cbd219a7: Move Base64Reader to utils packageTadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '596652cc5e44e3d6210287252a085735c60765c4':
| * | | | | am cbd219a7: Move Base64Reader to utils packageTadashi G. Takaoka2013-06-052-0/+342
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbd219a761079007b297c7d0cc1ca5d93420b0c9': Move Base64Reader to utils package
* | | | | | | am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8177b3abac3bbe4729ac4c27dd5cce4220628bf':
| * | | | | | am 9c440d13: Merge "Remove unnecessary Drawable.setState"Tadashi G. Takaoka2013-06-051-4/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c440d137300ddf72cca201cf08c9bb2e32d6836': Remove unnecessary Drawable.setState
* | | | | | | | am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8235d940c498d8fa55466abf4382d3e145b29f87':
| * | | | | | | am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"Tadashi G. Takaoka2013-06-042-0/+743
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d4e25182699f383e38f37fbff69bc2a7c9304bf': Add CsvUtils that conform to RFC 4180
* | | | | | | | | am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e10f4b6b778298ecc78c1be53c0c1002be1f5f6c':
| * | | | | | | | am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"Tadashi G. Takaoka2013-06-0415-143/+99
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bfc2bc419e7e758c6ce17b5fb959687f583551a': Add CODE_CAPSLOCK for long press shift key
* | | | | | | | | | am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related codeKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34a9e8bdfb101f2069a8a8156d10313a662b21db':
| * | | | | | | | | am ad0c6d7b: Cleanups in JNI related codeKen Wakasa2013-06-046-101/+70
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad0c6d7b3635f0c1d92a3e4d895909234b7a2f0d': Cleanups in JNI related code
* | | | | | | | | | | am 496bb8af: am 11dc3a37: Clean up macro variablesKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '496bb8af8b641018742038fcd750a072b00449d2':
| * | | | | | | | | | am 11dc3a37: Clean up macro variablesKen Wakasa2013-06-034-34/+58
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11dc3a371d3bc682f7307586761ae637170d3505': Clean up macro variables
* | | | | | | | | | | | am 0486b377: am 0dbae774: Merge "Avoid an NPE"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0486b377e74d592b722d2d490be34c8514781055':
| * | | | | | | | | | | am 0dbae774: Merge "Avoid an NPE"Kurt Partridge2013-06-031-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0dbae774969c4f467b9d51f621eca4c3a58a2717': Avoid an NPE
* | | | | | | | | | | | | am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '267928c9768256843eef15fc4bfc00298019a6ac':
| * | | | | | | | | | | | am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '981a194499b4ab50339f7b1c5444321cceb5f136': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | 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 ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'ea3027fec4bafc94a0404b117d051c3a821ca263':
* | | | | | | | | | | | | | | am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion is long" * commit '15aab5b1fe918c055502f26a4326bcb70d265bbd':
| * | | | | | | | | | | | | | am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"Tadashi G. Takaoka2013-06-031-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbc7acb6f521fb680564a4fc6132c1913491de77': Expand suggestion strip when center suggestion is long
* | | | | | | | | | | | | | | | am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afbaac36a88bf78d121be339898fdc90d075de81':
| * | | | | | | | | | | | | | | am 763fd9d5: Merge "Fix revert of committed words"Kurt Partridge2013-06-031-13/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '763fd9d5e9a3136a4a7300219b8094df089fe5b6': Fix revert of committed words
* | | | | | | | | | | | | | | | | am 3888cc24: am 156d3930: Remove a bunch macros that are no longer usedKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3888cc243d7f25b5d5b2cf57d0ca5833fe700d71':
| * | | | | | | | | | | | | | | | am 156d3930: Remove a bunch macros that are no longer usedKen Wakasa2013-06-032-33/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '156d39303ed565ed64f62d9963cdbba1b0096130': Remove a bunch macros that are no longer used
* | | | | | | | | | | | | | | | | | am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b593ec88ee086e9767f6422d27163306a64e4b77':
| * | | | | | | | | | | | | | | | | am db0aa747: Merge "Purge WordsPriorityQueue"Satoshi Kataoka2013-06-034-349/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db0aa747bec5b5ef5faafa7a2ede3c894a5e5724': Purge WordsPriorityQueue
* | | | | | | | | | | | | | | | | | | am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '887b635dc42ab2686b414650ffffe2e5c402de34':
| * | | | | | | | | | | | | | | | | | am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1Ken Wakasa2013-06-032-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4caf594198654ff2604b9cabc604e8a837f3d7a1': Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* | | | | | | | | | | | | | | | | | | | am 31bd7b17: am cbb1ee48: Fix buildSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31bd7b17703e4f61525f40560028e732d4a7059a':
| * | | | | | | | | | | | | | | | | | | am cbb1ee48: Fix buildSatoshi Kataoka2013-06-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbb1ee485c9d151cdfb3391a314d537f7f15f27e': Fix build
* | | | | | | | | | | | | | | | | | | | | am adf68c58: am b4ae86f0: Merge "Rename methods for readability"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adf68c5828d1647680113a99c6b77e8b920da0af':
| * | | | | | | | | | | | | | | | | | | | am b4ae86f0: Merge "Rename methods for readability"Tadashi G. Takaoka2013-06-035-33/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4ae86f0de556bea6d809d8d8cb89007d8900446': Rename methods for readability
* | | | | | | | | | | | | | | | | | | | | | am f4f547f0: am dceebee4: Purge UnigramDictionarySatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4f547f0e7874526d5b02126a3c01cca17534af6':
| * | | | | | | | | | | | | | | | | | | | | am dceebee4: Purge UnigramDictionarySatoshi Kataoka2013-06-034-1119/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dceebee4b82166e7f24ff6c0f0e4cb4b0c89b0e1': Purge UnigramDictionary
* | | | | | | | | | | | | | | | | | | | | | | am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8335703d404ec98a4971f7fde577a8f239391c5':
| * | | | | | | | | | | | | | | | | | | | | | am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"Satoshi Kataoka2013-06-032-28/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb6a7c828bbafd210e99727504b09ba8f23e8479': Migrate used functions in UnigramDicitonary
* | | | | | | | | | | | | | | | | | | | | | | | am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typing starts" * commit '3e543e27259144d63a5d18074724f299e096af49':
| * | | | | | | | | | | | | | | | | | | | | | | am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"Tadashi G. Takaoka2013-06-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a529b85d084b1534a29b25efd27aaf881e399d1': Clear previous suggestions when gesture typing starts
* | | | | | | | | | | | | | | | | | | | | | | | | am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7974e8c270bdae90ab40bdf216730a3ce8b7056':
| * | | | | | | | | | | | | | | | | | | | | | | | am d858b581: Move obsolete files to obsolete dir 2Satoshi Kataoka2013-06-039-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd858b5815f22ba2232b16ca0ba2a52703afffbe6': Move obsolete files to obsolete dir 2
* | | | | | | | | | | | | | | | | | | | | | | | | | am 9b5d603e: am e0bbb98d: Fix buildSatoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b5d603e17b1bae2d8619110f24c5777c92fd7fa':
| * | | | | | | | | | | | | | | | | | | | | | | | | am e0bbb98d: Fix buildSatoshi Kataoka2013-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0bbb98d60039aeaac1fa33637fca34046e0a3cb': Fix build