aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | am a3e47f87: am 74089a09: am ba0e497a: Merge commit ↵Baligh Uddin2013-03-210-0/+0
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit 'a3e47f87805f31edfc93c0701bb25c788eb3c707': am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * | | | | | | | | | | am 74089a09: am ba0e497a: Merge commit ↵Baligh Uddin2013-03-221-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits) am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE ...
| | * | | | | | | | | am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into ↵Baligh Uddin2013-03-2219-394/+607
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'ba0e497a0c53ae2a64c070544f6a6f0495442343': (126 commits) am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. Support feedback Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE [FileEncap9] Extract ResearchLogDirectory class [Lazy2] Pass a runnable to abort [Lazy1] Switch to blocking log closures Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE [Lazy4] Remove useless debug code [FileEncap8] Remove useless "success" variable [FileEncap7] Extract uploadContents method [FileEncap6] Extract Uploader class Import translations. DO NOT MERGE Import translations. DO NOT MERGE [FileEncap5] Move conditional logic to caller [FileEncap4] Simplify logic [FileEncap3] Extract isUploadingUnconditionally method ...
| | | * | | | | | | | Merge commit '525bbec9eccbf5bd4581c2b9908e46f61c4431ad' into jb-mr2-devBaligh Uddin2013-03-2119-394/+607
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a ↵Alan Viverette2013-03-201-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null keyboard view. * commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c': Prevent keyboard A11y proxy from referencing a null keyboard view.
| | | | * | | | | | | merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogleThe Android Automerger2013-03-190-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26d82ea1465ff4a7617b0cd5a94bb6a8c1b8df76 Auto-generated-cl: translation import
| | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec0b99658d2bdbf7d6cd640733dcb9de3bc33ef0 Auto-generated-cl: translation import
| | | | | * | | | | | | keep history after resetThe Android Automerger2013-03-120-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I545d16f26fc007432057bc1520e0d85226f026d3 Auto-generated-cl: translation import
* | | | | | | | | | | | | am 140b6705: Merge "Fix appname"Satoshi Kataoka2013-03-211-4/+4
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '140b6705ece0559f2ea9647044b3baf6a314f3d3': Fix appname
| * | | | | | | | | | | Merge "Fix appname"Satoshi Kataoka2013-03-221-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix appnameSatoshi Kataoka2013-03-221-4/+4
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: I224bd1b734f74db31c006601129339c099616ed6
* | | | | | | | | | | am ee91bde1: Clean up InflateException reference from KeyboardBuilderTadashi G. Takaoka2013-03-201-2/+1
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee91bde16c34af80201efb5f8d056caecbbbf338': Clean up InflateException reference from KeyboardBuilder
| * | | | | | | | | Clean up InflateException reference from KeyboardBuilderTadashi G. Takaoka2013-03-211-2/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9daa00b6d829ce2069a027e4bfec310ec108615
* | | | | | | | / am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-03-200-0/+0
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'a6fae701e344fcfda01b835c762855140d2de7e9': Prevent keyboard A11y proxy from referencing a null keyboard view.
| * | | | | | | am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c': Prevent keyboard A11y proxy from referencing a null keyboard view.
| | * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | Change-Id: I6854ee735b15189c2987281e5f0525687dcb3b21
| | | * | | | Prevent keyboard A11y proxy from referencing a null keyboard view.Alan Viverette2013-03-191-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8402674 Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
* | | | | | | am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a ↵Alan Viverette2013-03-191-0/+25
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | null keyboard view. * commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c': Prevent keyboard A11y proxy from referencing a null keyboard view.
| * | | | | am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.Alan Viverette2013-03-191-0/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '559616fb0c39e2f0bacdf294b84ba16ad1e8f371': Prevent keyboard A11y proxy from referencing a null keyboard view.
| | * | | | Prevent keyboard A11y proxy from referencing a null keyboard view.Alan Viverette2013-03-191-0/+25
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 8402674 Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
* | | | | am a462cd80: Support feedbackSatoshi Kataoka2013-03-195-0/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645': Support feedback
| * | | | Support feedbackSatoshi Kataoka2013-03-195-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8143554 Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
* | | | | am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to buildJean Chalard2013-03-198-34/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7': Break dependencies to allow offdevice tests to build
| * | | | am 1061bfdb: Break dependencies to allow offdevice tests to buildJean Chalard2013-03-198-34/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '1061bfdb34bbcb63bf0046eec42313d264ac33fa': Break dependencies to allow offdevice tests to build
| | * | | Break dependencies to allow offdevice tests to buildJean Chalard2013-03-198-34/+61
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9a2e8f0672b3f72943f26fb15de1d3c7c5ce7f1
* | | | | am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.Jean Chalard2013-03-1993-34/+7481
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6d90a10a343723b8613fd22d323c586ecc33b284': Merge the dictionary pack in Latin IME.
| * | | | am 0cc0544a: Merge the dictionary pack in Latin IME.Jean Chalard2013-03-1993-34/+7481
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0cc0544a2995c7eb54a830ae54db60af89d4073d': Merge the dictionary pack in Latin IME.
| | * | | Merge the dictionary pack in Latin IME.Jean Chalard2013-03-1993-34/+7481
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8161354 Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
* | | | | am 841c295f: resolved conflicts for merge of 5b048292 to masterTadashi G. Takaoka2013-03-1820-93/+111
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '841c295f3c99214f45924434d9c0bb5b4760578d': Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
| * | | | resolved conflicts for merge of 5b048292 to masterTadashi G. Takaoka2013-03-1920-93/+111
| |\| | | | | | | | | | | | | | | | | | Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
| | * | | Merge "Rename ProductionFlag.IS_EXPERIMENTAL to ↵Ken Wakasa2013-03-1919-91/+108
| | |\ \ \ | | | | | | | | | | | | | | | | | | USES_DEVELOPMENT_ONLY_DIAGNOSTICS" into jb-mr2-dev
| | | * | | Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICSKen Wakasa2013-03-1819-91/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8393568 Change-Id: Ie5edf44a3627aca9416145aff56bf05bbf2a05f3
* | | | | | am bbadc6ed: (-s ours) am 20591e43: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0': Import translations. DO NOT MERGE
| * | | | | am 20591e43: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20591e43c42d953de1fa474670a70a10a819f60f': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I0400e547eb41b707eeb8284bd96463068baab957 Auto-generated-cl: translation import
* | | | | am c542a588: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c542a5882efde7b15a7278041c15a93c4d577ca9': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie70585ed9a13c8f17b8744664bee6ab7eb511c36 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-187-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873 Auto-generated-cl: translation import
* | | | | am f8325ec4: am 5cb0560b: Merge "Access the dictionary pack only if have ↵Jean Chalard2013-03-181-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERNET permission" into jb-mr2-dev * commit 'f8325ec4bb83f91d53949562556652bff315f088': Access the dictionary pack only if have INTERNET permission
| * | | | am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET ↵Jean Chalard2013-03-181-2/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission" into jb-mr2-dev * commit '5cb0560b000f37b3fb3937f01b6d3e928afef57a': Access the dictionary pack only if have INTERNET permission
| | * | | Merge "Access the dictionary pack only if have INTERNET permission" into ↵Jean Chalard2013-03-181-2/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | | Access the dictionary pack only if have INTERNET permissionJean Chalard2013-03-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8161354 Change-Id: I68ee3acb2955a017d25666cc2dad791798f9064a
* | | | | | am 62ed594c: am e0e67373: Refactor parameters by naming conventionSatoshi Kataoka2013-03-1712-120/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62ed594c373e172ba7b32d099911b318dcbfc7b2': Refactor parameters by naming convention
| * | | | | am e0e67373: Refactor parameters by naming conventionSatoshi Kataoka2013-03-1812-120/+127
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0e67373735918c78eaeaf24f127e1d28816aa29': Refactor parameters by naming convention
| | * | | | Refactor parameters by naming conventionSatoshi Kataoka2013-03-1812-120/+127
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bda8075b33f656ecbec08320afcd864b620fe77
* | | | | | am 3268a44e: am a5067333: Disable the header list of DebugSettingsActivityTadashi G. Takaoka2013-03-152-7/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3268a44e1cde2f4e14d01ac62e2e1a6e9a70a601': Disable the header list of DebugSettingsActivity
| * | | | | am a5067333: Disable the header list of DebugSettingsActivityTadashi G. Takaoka2013-03-152-7/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a50673330e012f6cca02b83eca1c047b8da319e0': Disable the header list of DebugSettingsActivity
| | * | | | Disable the header list of DebugSettingsActivityTadashi G. Takaoka2013-03-152-7/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses the issue that the debug settings on 10-inch tablet doesn't show up. Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-31 06:42:59 +0000