aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46...•••* commit '24bf247553eb5358249006350fd577d12ae3a8e5': The Android Open Source Project2013-10-030-0/+0
|\
| * am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387...•••* commit '98afd4f919beff33f0cdb8d7adb4115dca6e9a07': The Android Open Source Project2013-09-260-0/+0
| |\
| | * am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcil...•••* commit 'f0bdb131aba520b6b1920bfc3e418c6b1f63eb26': The Android Open Source Project2013-09-260-0/+0
| | |\
* | | | am bc1ad68e: (-s ours) am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77...•••* commit 'bc1ad68e153401d5fb876880a99a30809866cd4c': Baligh Uddin2013-10-030-0/+0
|\| | |
| * | | am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "I...•••* commit '8054a056ca640ebe1adbca9c60e5ddd4560d96cd': Baligh Uddin2013-09-260-0/+0
| |\| |
| | * | am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO ...•••* commit '64d0fa4071e3377d5a4834ae83c59e1df7c4ba08': Baligh Uddin2013-09-260-0/+0
| | |\ \
* | | | | am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"•••* commit 'd0fb2b4164e990904d07fbc645b5ea760a980726': Satoshi Kataoka2013-10-030-0/+0
|\| | | |
| * | | | am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"•••* commit 'c1eccc94035edd394f998ce5f0e94eb599d7c6b7': Satoshi Kataoka2013-09-260-0/+0
| |\| | |
| | * | | am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"•••* commit '28c7e634264a91343e98b9e9afad2083ce9dc1b7': Satoshi Kataoka2013-09-260-0/+0
| | |\ \ \
* | | | | | am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMetho...•••* commit '0800da99d8e7063b7b1366cbbd9ab2d9809efe88': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | |
| * | | | | am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in s...•••* commit '0b5b3f7b09465d330c6907865a129a146a881842': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | |
| | * | | | am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard•••* commit 'c68632af622665bc5143c17954826bb1ab240164': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \
* | | | | | | am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no l...•••* commit '8f4ed0b899d305c905dc67bcc33cecd614bb5028': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | |
| * | | | | | am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"•••* commit 'ac48cca43798347930400a03a9df3071068dd558': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | |
| | * | | | | am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"•••* commit '60261af55f03624b46a9102cc3014a3ee3461e12': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \
* | | | | | | | am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal arg...•••* commit '76c87e8cb8a031483c8001a6176e70fe6ffeee0d': Jean Chalard2013-10-030-0/+0
|\| | | | | | |
| * | | | | | | am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"•••* commit '13a02a8db2646dd605d4d4fb1e849b2684326165': Jean Chalard2013-09-260-0/+0
| |\| | | | | |
| | * | | | | | am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"•••* commit 'f637bb33432b77a04e2a3f0a4cb552bfc0749e1a': Jean Chalard2013-09-260-0/+0
| | |\ \ \ \ \ \
* | | | | | | | | am 8f5921bf: (-s ours) am b17fe378: (-s ours) am bd21edc9: (-s ours) am 1665c...•••* commit '8f5921bf5d9e175a1e919e412dfd4157b3156003': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | |
| * | | | | | | | am b17fe378: (-s ours) am bd21edc9: (-s ours) am 1665cc27: (-s ours) am 05ee4...•••* commit 'b17fe37853cf554b8fabdc9418eabfb645c3ef50': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | |
| | * | | | | | | am bd21edc9: (-s ours) am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d...•••* commit 'bd21edc977988060cc9ba75fe95edce42b809abe': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \
* | | | | | | | | | am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One specia...•••* commit 'b2a1851523d7e715f077c0326d06153392e69ad7': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | |
| * | | | | | | | | am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"•••* commit 'e162eb7e01c1404543b6877b26303dd27ec4dc8c': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | | |
| | * | | | | | | | am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"•••* commit '48f20fb8924cd93528bd60b2ad28b36386d636da': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to...•••* commit '37a44353faddec1a40579385c856ab2bbb8d8173': Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff...•••* commit 'f01644c406c590b118ec7b69290d454bed2b648e': Jean Chalard2013-09-260-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an Arra...•••* commit '323dd492f05cdbef0957875d948f0e76b8e8fd5b': Jean Chalard2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"•••* commit '9b91243f4a64f9c8f8793ddfc2653d007d64c057': Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"•••* commit 'ff6a55812cc28a42bc1b2f331800b6824039bc00': Satoshi Kataoka2013-09-260-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"•••* commit '2fa14bc54d7848224519294bb1b721f5764176a1': Satoshi Kataoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to util...•••* commit 'b8d0dad0863fc685ef0d0cb856304b19c5534d47': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package•••* commit 'a4d4cae324f20aad1f638aa7caece40d214c0d37': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 596652cc: am cbd219a7: Move Base64Reader to utils package•••* commit '596652cc5e44e3d6210287252a085735c60765c4': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary...•••* commit '8b4fad975e31a8054259c76916c7b03353eab9ac': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.set...•••* commit '9bd148ebb24b0782f8b2fdebc0e632ecdaf93c49': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"•••* commit 'd8177b3abac3bbe4729ac4c27dd5cce4220628bf': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that ...•••* commit '0dd57b18beee4f8fc562fc0d43e7059aff52dc59': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RF...•••* commit 'c86c1294791a48cd5f59a7cd6b70e5f181fd0c94': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"•••* commit '8235d940c498d8fa55466abf4382d3e145b29f87': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK ...•••* commit '7a4c7d0583ded5b9e260d41cb15bb507c504fcb1': Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long pres...•••* commit '30183b22d20294bb9e9ed25740a2ad4e005ff894': Tadashi G. Takaoka2013-09-260-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"•••* commit 'e10f4b6b778298ecc78c1be53c0c1002be1f5f6c': Tadashi G. Takaoka2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code•••* commit '33ec5357ed67d3f379dc12ef19400b0ca2d3a861': Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code•••* commit '49b9d16b8755bf45acebba85ee8d4977074d50eb': Ken Wakasa2013-09-260-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code•••* commit '34a9e8bdfb101f2069a8a8156d10313a662b21db': Ken Wakasa2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables•••* commit '23fe55d0f4a61d42d6d0d6079081325ed967d24c': Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables•••* commit '020a5704b67b3f9f05925456102b37497cee53d9': Ken Wakasa2013-09-260-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 496bb8af: am 11dc3a37: Clean up macro variables•••* commit '496bb8af8b641018742038fcd750a072b00449d2': Ken Wakasa2013-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"•••* commit 'e8be6f74fe698e23360b7f6d42f264ae1c23fe13': Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"•••* commit '4865f81880d1b39e042b27406e725cb02866d855': Kurt Partridge2013-09-260-0/+0
| |\| | | | | | | | | | | | | | | | |