aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fd3600a4: am 3cdea37c: am eac0eb89: Merge "Fix ResearchLogger feedback bug"Kurt Partridge2013-09-260-0/+0
|\ | | | | | | * commit 'fd3600a4ed2eb048b3f0004a66ab1c1a87c78fd7':
| * am 3cdea37c: am eac0eb89: Merge "Fix ResearchLogger feedback bug"Kurt Partridge2013-09-260-0/+0
| |\ | | | | | | | | | * commit '3cdea37c6d513d56732933c00a67e9e584731582':
* | | am 282ebe38: am e18732ef: am dfd96be0: Retun an empty Path instead of nullTadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | * commit '282ebe38abbf62b999560b67878a6a34c1bb96f4':
| * | am e18732ef: am dfd96be0: Retun an empty Path instead of nullTadashi G. Takaoka2013-09-260-0/+0
| |\ \ | | | | | | | | | | | | * commit 'e18732ef5295e9832a0d74c99952a3061dacb4aa':
* | | | am 88fd780f: (-s ours) am 1b2e6fbf: (-s ours) am 2933f9e8: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '88fd780ff037842f96510ed494841b0865b4d5af':
| * | | am 1b2e6fbf: (-s ours) am 2933f9e8: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '1b2e6fbff42b61eff8494f3930bc1586543da8d4':
* | | | | am dad82a7c: am 2c895d4d: am f473f4b1: Remove unused macros in defines.hKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'dad82a7c7b86839b0cbcc30d86f0709612ce536a':
| * | | | am 2c895d4d: am f473f4b1: Remove unused macros in defines.hKen Wakasa2013-09-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit '2c895d4d3a73c5c449d5760b42c4f3d6f6e4136f':
* | | | | | am 5ab662de: am 61e9de73: am 0b7cd6a0: Fix: Android.mk for ↵Keisuke Kuroynagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autocorrection_threshold_utils. * commit '5ab662debe7779f70c0395d754a356055d440fcd':
| * | | | | am 61e9de73: am 0b7cd6a0: Fix: Android.mk for autocorrection_threshold_utils.Keisuke Kuroynagi2013-09-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit '61e9de73e09a0fd295fad407d0d5347bddeea9cb':
* | | | | | | am 8b6de7a8: am 67550776: am 527c1283: Remove unused methods.Keisuke Kuroynagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b6de7a86977b48951582b861d97592f34de2293':
| * | | | | | am 67550776: am 527c1283: Remove unused methods.Keisuke Kuroynagi2013-09-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '675507766a812b93800273511a071f39fa1443c9':
* | | | | | | | am d51f4e69: am 35b514bd: am cd4edc15: Merge "Cache three main keyboards to ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve average switch time" * commit 'd51f4e695d2ca07d408e5f849aef6e6233d2f027':
| * | | | | | | am 35b514bd: am cd4edc15: Merge "Cache three main keyboards to improve ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | average switch time" * commit '35b514bdb1947f38489020f33aba3ce0868b82f3':
* | | | | | | | | am bf71301e: am 1784d92e: am e3338420: Merge "Introduce ↵Keisuke Kuroynagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BinaryDictionaryHeader to access binary dictionary header." * commit 'bf71301e6636fe79e2665d9ce743843a6951a497':
| * | | | | | | | am 1784d92e: am e3338420: Merge "Introduce BinaryDictionaryHeader to access ↵Keisuke Kuroynagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary dictionary header." * commit '1784d92e6f82abd47cb5dac0a523d23bf73f76f2':
* | | | | | | | | | am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46273: (-s ours) am ↵The Android Open Source Project2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '98afd4f919beff33f0cdb8d7adb4115dca6e9a07':
| * | | | | | | | | am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) ↵The Android Open Source Project2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'f0bdb131aba520b6b1920bfc3e418c6b1f63eb26':
* | | | | | | | | | | am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '8054a056ca640ebe1adbca9c60e5ddd4560d96cd':
| * | | | | | | | | | am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '64d0fa4071e3377d5a4834ae83c59e1df7c4ba08':
* | | | | | | | | | | | am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1eccc94035edd394f998ce5f0e94eb599d7c6b7':
| * | | | | | | | | | | am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28c7e634264a91343e98b9e9afad2083ce9dc1b7':
* | | | | | | | | | | | | am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup wizard * commit '0b5b3f7b09465d330c6907865a129a146a881842':
| * | | | | | | | | | | | am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizardTadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c68632af622665bc5143c17954826bb1ab240164':
* | | | | | | | | | | | | | am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac48cca43798347930400a03a9df3071068dd558':
| * | | | | | | | | | | | | am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60261af55f03624b46a9102cc3014a3ee3461e12':
* | | | | | | | | | | | | | | am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13a02a8db2646dd605d4d4fb1e849b2684326165':
| * | | | | | | | | | | | | | am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f637bb33432b77a04e2a3f0a4cb552bfc0749e1a':
* | | | | | | | | | | | | | | | am b17fe378: (-s ours) am bd21edc9: (-s ours) am 1665cc27: (-s ours) am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE) * commit 'b17fe37853cf554b8fabdc9418eabfb645c3ef50':
| * | | | | | | | | | | | | | | 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 e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e162eb7e01c1404543b6877b26303dd27ec4dc8c':
| * | | | | | | | | | | | | | | | am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48f20fb8924cd93528bd60b2ad28b36386d636da':
* | | | | | | | | | | | | | | | | | am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stuff from an ArrayList." * commit 'f01644c406c590b118ec7b69290d454bed2b648e':
| * | | | | | | | | | | | | | | | | am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArrayList." * commit '323dd492f05cdbef0957875d948f0e76b8e8fd5b':
* | | | | | | | | | | | | | | | | | | am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff6a55812cc28a42bc1b2f331800b6824039bc00':
| * | | | | | | | | | | | | | | | | | am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fa14bc54d7848224519294bb1b721f5764176a1':
* | | | | | | | | | | | | | | | | | | | am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils packageTadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4d4cae324f20aad1f638aa7caece40d214c0d37':
| * | | | | | | | | | | | | | | | | | | am 596652cc: am cbd219a7: Move Base64Reader to utils packageTadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '596652cc5e44e3d6210287252a085735c60765c4':
* | | | | | | | | | | | | | | | | | | | | am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawable.setState" * commit '9bd148ebb24b0782f8b2fdebc0e632ecdaf93c49':
| * | | | | | | | | | | | | | | | | | | | am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8177b3abac3bbe4729ac4c27dd5cce4220628bf':
* | | | | | | | | | | | | | | | | | | | | | am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 4180" * commit 'c86c1294791a48cd5f59a7cd6b70e5f181fd0c94':
| * | | | | | | | | | | | | | | | | | | | | am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8235d940c498d8fa55466abf4382d3e145b29f87':
* | | | | | | | | | | | | | | | | | | | | | | 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':