aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 680f5e14: am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ↵The Android Open Source Project2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '680f5e14d41eb1bc4c5c4a26e607d821b446758f':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am ↵The Android Open Source Project2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '24bf247553eb5358249006350fd577d12ae3a8e5':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | 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 7a8ea815: (-s ours) am bc1ad68e: (-s ours) am 8054a056: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7a8ea815cde6b8f026707a2080d6f4474d498e7b':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bc1ad68e: (-s ours) am 8054a056: (-s ours) am 64d0fa40: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'bc1ad68e153401d5fb876880a99a30809866cd4c':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2e5e3edd: am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible NPE" * commit '2e5e3edd165488adbda0aa8ecb84878a1bc89690':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0fb2b4164e990904d07fbc645b5ea760a980726':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 81e36c3c: am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputMethodManager in setup wizard * commit '81e36c3c353d63e7e8a26e1ff6faa0780ce82b3f':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputMethodManager in setup wizard * commit '0800da99d8e7063b7b1366cbbd9ab2d9809efe88':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 3edb2b8b: am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Defer getting no language subtype" * commit '3edb2b8b13e5342ba2392c5f5aa9e3ac962c5fa1':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language subtype" * commit '8f4ed0b899d305c905dc67bcc33cecd614bb5028':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 450e3af1: am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an illegal argument exception" * commit '450e3af112fcbcbce5eca6170e2e10f80e22fcd4':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argument exception" * commit '76c87e8cb8a031483c8001a6176e70fe6ffeee0d':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 e87c22fa: am 8f5921bf: (-s ours) am b17fe378: (-s ours) am bd21edc9: (-s ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE) * commit 'e87c22fa7add581863f2822ce43ea3902e31a475':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8f5921bf: (-s ours) am b17fe378: (-s ours) am bd21edc9: (-s ours) am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE) * commit '8f5921bf5d9e175a1e919e412dfd4157b3156003':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 3872c243: am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTC One special edition" * commit '3872c243f2b04e8e77180e70616afd31dd76cbfb':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | special edition" * commit 'b2a1851523d7e715f077c0326d06153392e69ad7':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 f022548e: am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an iterator to remove stuff from an ArrayList." * commit 'f022548eec7ba1e3e27b38d3eacb1e9cc776e8bc':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to remove stuff from an ArrayList." * commit '37a44353faddec1a40579385c856ab2bbb8d8173':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a possible NPE" * commit '21f21877db1950c66af0edfecec6087d5cf91d86':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b91243f4a64f9c8f8793ddfc2653d007d64c057':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 3f75c760: am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base64Reader to utils package * commit '3f75c7609f3a9be79a5bff35c3dce73dae3bb672':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | utils package * commit 'b8d0dad0863fc685ef0d0cb856304b19c5534d47':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 8fa567c7: am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Remove unnecessary Drawable.setState" * commit '8fa567c790c75bb8f80dc9535835bbdef6d8a245':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary Drawable.setState" * commit '8b4fad975e31a8054259c76916c7b03353eab9ac':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 99771a81: am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CsvUtils that conform to RFC 4180" * commit '99771a81bd9d7527ec945a942a233927ad21db07':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conform to RFC 4180" * commit '0dd57b18beee4f8fc562fc0d43e7059aff52dc59':