aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 97ddbf22: am 19a70087: Merge "Fix appname"Satoshi Kataoka2013-03-2757-1343/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97ddbf22d5c6d4791b3115526fdc885a40009695': Fix appname
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 19a70087: Merge "Fix appname"Satoshi Kataoka2013-03-2257-1343/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19a7008728867aa639a2fac66459ce3fe0526cd8': Fix appname
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused importTadashi G. Takaoka2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0992fd245b33828577742238492249f009defde6':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1e3c73de: am 3a8a63c3: Remove unused importTadashi G. Takaoka2013-03-272-2/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e3c73de06caeeba31cb43099f4555e1ed17dba4': Remove unused import
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3a8a63c3: Remove unused importTadashi G. Takaoka2013-03-212-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a8a63c3999c0ffccbaa08a860e807bb59c1643f': Remove unused import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to ↵Tadashi G. Takaoka2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string.english_ime_name" * commit 'bb679a224f4daf00d8f65c2903bf90a9253b5e1b':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-273-11/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1': Remove reference to string.english_ime_name
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c6452f25: Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-213-11/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6452f2569448aee841ad70baaa27c660a753aff': Remove reference to string.english_ime_name
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"Satoshi Kataoka2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bb504cedbe3c86f7f54c98afd36e5301ff1c9f9':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 45728330: am f4352c2c: Merge "Use correct appname resource"Satoshi Kataoka2013-03-271-7/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '457283308a2bb929a473086040b402c673aca390': Use correct appname resource
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f4352c2c: Merge "Use correct appname resource"Satoshi Kataoka2013-03-211-7/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4352c2ce3849444c4a930fe7e5319ecdfd5d18a': Use correct appname resource
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge ↵Baligh Uddin2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '4b66d0c483ed1724cd24cfcf959a7b974fc2ef4b':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit ↵Baligh Uddin2013-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit 'a01fb001b4589eb51fdb5bbea8f8210730a57d79':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"Satoshi Kataoka2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cc63149580a2cc567435173843f3aa653e57a3b':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c1c3e03c: am 140b6705: Merge "Fix appname"Satoshi Kataoka2013-03-271-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1c3e03c12891dfd8a87f1254c8bc9d9ccc9333a': Fix appname
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 140b6705: Merge "Fix appname"Satoshi Kataoka2013-03-211-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '140b6705ece0559f2ea9647044b3baf6a314f3d3': Fix appname
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference ↵Tadashi G. Takaoka2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from KeyboardBuilder * commit 'dbb90d08b548bc59bec26d464757427cd07a4ef1':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bd7b4fcc: am ee91bde1: Clean up InflateException reference from ↵Tadashi G. Takaoka2013-03-271-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyboardBuilder * commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205': Clean up InflateException reference from KeyboardBuilder
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ee91bde1: Clean up InflateException reference from KeyboardBuilderTadashi G. Takaoka2013-03-201-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee91bde16c34af80201efb5f8d056caecbbbf338': Clean up InflateException reference from KeyboardBuilder
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ↵The Android Open Source Project2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Reconcile with jb-mr2-release - do not merge * commit '210226c5594249624421a2385ef5410b88de02e4':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with ↵The Android Open Source Project2013-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-release - do not merge * commit '54f0ae278b49eb1d1147cdabc3c391fb5c4f869b':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y ↵Alan Viverette2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proxy from referencing a null keyboard view. * commit '9ecac40d8516d57480a0a91ccf1acdffd511266e':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from ↵Alan Viverette2013-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | referencing a null keyboard view. * commit '4f11af0c783718f3b899d1ccb15f9ddfd9ba1070':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string ↵Jean Chalard2013-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limits" into jb-mr2-dev * commit '2f73105a862cf97148ecd5fdaa25da9f0b98f32a': [DO NOT MERGE] Increase string limits
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-devJean Chalard2013-03-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db5e07f75633ee89631bd6903378884b84bc1242': [DO NOT MERGE] Increase string limits
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-devJean Chalard2013-03-281-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] Increase string limitsJean Chalard2013-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been requested by the translators. For some reason the limits were shorter than the actual source strings. Both these messages are meant to be displayed alone on the screen, and 50 chars should fit comfortably. Bug: 8442366 Bug: 8442144 Change-Id: I7845f85ddee992313f658e0268d090eae73778b3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Increase string limits"Jean Chalard2013-03-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase string limitsJean Chalard2013-03-281-2/+2
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been requested by the translators. For some reason the limits were shorter than the actual source strings. Both these messages are meant to be displayed alone on the screen, and 50 chars should fit comfortably. Bug: 8442366 Bug: 8442144 Change-Id: I7062e533e5d4521d2866a6c5f947c8f25b790675
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGEBaligh Uddin2013-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c57cf2b776d5b03d55835e90db6aeaa6cd2e4a00': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 841e6016: Import translations. DO NOT MERGEBaligh Uddin2013-03-273-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '841e60163b6b1452f37d8731d98a30923c6099b7': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-273-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-274-16/+12
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1a341b949098fc55c0e5f46c976547ba02f8eca Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Possible NPE"Satoshi Kataoka2013-03-271-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Possible NPESatoshi Kataoka2013-03-261-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8448448 Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix possible SIOOBE"Satoshi Kataoka2013-03-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix possible SIOOBESatoshi Kataoka2013-03-271-2/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8461021 Change-Id: I8b0385610b80b5a672ec380935c485a0e01ae984
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close ResearchLogger upon onFinishInputView"Kurt Partridge2013-03-262-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Close ResearchLogger upon onFinishInputViewKurt Partridge2013-03-252-17/+17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ResearchLogger#stop() was called both in LatinIME#onFinishInputView() and in LatinIME#onWindowHidden(). This resulted in multiple logs being written. Since onFinishInputView is the more reliable of the two (it is called in InputMethodService#onDestroy; onWindowHidden is not), the code now uses onFinishInputView as a stopping signal. Change-Id: Iae4b8c3bdab226027624eeab19b3737367e4a108
* | | | | | | | | | | | | | | | | | | | | | | | | | am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':
| * | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7
| | * | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Add const_cast to live with host's jni.hTadashi G. Takaoka2013-03-263-22/+36
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7970626 Change-Id: I2fd09e16dd9df36eebca2d737a0b7cc3ddd1c862
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Use XmlPullParser.getEventType()"Tadashi G. Takaoka2013-03-262-17/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Use XmlPullParser.getEventType()Tadashi G. Takaoka2013-03-262-17/+19
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie423d3416639f81409cc920658c8088b7519b045
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix possible NPE"Satoshi Kataoka2013-03-261-19/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |