fba5459750
Import translations. DO NOT MERGE
...
Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9
Auto-generated-cl: translation import
2013-03-25 15:38:08 -07:00
eaded6bdd8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:56:44 -07:00
a17dccbfc6
Fix possible NPE
...
Bug: 8457109
Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
2013-03-25 19:00:38 +09:00
ec183b50ff
am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
...
* commit 'fb658d6c531de8cfd55e4d36bffc9ccabc401f94':
Fix possible ArrayIndexOutOfBoundsException
2013-03-24 22:54:39 -07:00
fb658d6c53
Fix possible ArrayIndexOutOfBoundsException
...
Bug: 8461864
Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
2013-03-25 12:37:04 +09:00
2a01fc22d4
am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
...
* commit '1e5add78094c7716ce063748e839d223b5a115a5':
Import translations. DO NOT MERGE
2013-03-22 18:53:15 -07:00
1e5add7809
am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
...
* commit '7668deece811d5f11ee652d6b5e5d7611273b270':
Import translations. DO NOT MERGE
2013-03-23 01:50:08 +00:00
8636ba03a7
am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'afe343c16fbb3c15ff8d6cf376b750737c675307':
Import translations. DO NOT MERGE
2013-03-22 18:49:52 -07:00
afe343c16f
Merge "Import translations. DO NOT MERGE"
2013-03-23 01:48:28 +00:00
7668deece8
am 21160c4e: Import translations. DO NOT MERGE
...
* commit '21160c4eba74344a583cae423b1909483559c87f':
Import translations. DO NOT MERGE
2013-03-23 01:47:46 +00:00
5709e859a5
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-23 01:46:36 +00:00
e47ee18192
am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit 'a7b4398c35eaf87fd00086f660af7710c071c369':
Don't announce changes for A11y within the same keyboard mode.
2013-03-22 17:49:59 -07:00
56a2088e7d
Import translations. DO NOT MERGE
...
Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1
Auto-generated-cl: translation import
2013-03-22 13:39:40 -07:00
2fd2d0b313
Import translations. DO NOT MERGE
...
Change-Id: Ib1a70c593647850ead05ecd9440b8db78c8139c7
Auto-generated-cl: translation import
2013-03-22 13:34:04 -07:00
1af30bab94
Import translations. DO NOT MERGE
...
Change-Id: I31bcd942f18166658143b4dbd5695f66f4717a22
Auto-generated-cl: translation import
2013-03-22 13:32:54 -07:00
21160c4eba
Import translations. DO NOT MERGE
...
Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c
Auto-generated-cl: translation import
2013-03-22 13:31:54 -07:00
a7b4398c35
Don't announce changes for A11y within the same keyboard mode.
...
Bug: 8439108
Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
2013-03-22 11:53:12 -07:00
97ddbf22d5
am 19a70087: Merge "Fix appname"
...
* commit '19a7008728867aa639a2fac66459ce3fe0526cd8':
Fix appname
2013-03-22 00:25:19 -07:00
19a7008728
Merge "Fix appname"
2013-03-22 07:23:08 +00:00
3c8117c88f
Fix appname
...
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
2013-03-22 16:19:44 +09:00
1e3c73de06
am 3a8a63c3: Remove unused import
...
* commit '3a8a63c3999c0ffccbaa08a860e807bb59c1643f':
Remove unused import
2013-03-21 23:25:36 -07:00
3a8a63c399
Remove unused import
...
This is a follow up of I062c076f.
Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
2013-03-22 15:23:06 +09:00
3d0fee4e09
am c6452f25: Merge "Remove reference to string.english_ime_name"
...
* commit 'c6452f2569448aee841ad70baaa27c660a753aff':
Remove reference to string.english_ime_name
2013-03-21 22:13:40 -07:00
457283308a
am f4352c2c: Merge "Use correct appname resource"
...
* commit 'f4352c2ce3849444c4a930fe7e5319ecdfd5d18a':
Use correct appname resource
2013-03-21 22:13:39 -07:00
c6452f2569
Merge "Remove reference to string.english_ime_name"
2013-03-22 05:11:50 +00:00
f4352c2ce3
Merge "Use correct appname resource"
2013-03-22 05:11:26 +00:00
242c066dde
Use correct appname resource
...
Bug: 6789579
Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8
2013-03-22 14:08:38 +09:00
9f3774c194
Remove reference to string.english_ime_name
...
Bug: 6789579
Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d
2013-03-22 14:08:23 +09:00
a01fb001b4
am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'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
2013-03-21 22:05:14 -07:00
a3e47f8780
am 74089a09: am ba0e497a: Merge commit \'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
...
2013-03-22 05:01:10 +00:00
74089a0946
am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into 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
...
2013-03-22 04:59:59 +00:00
ba0e497a0c
Merge commit '525bbec9eccbf5bd4581c2b9908e46f61c4431ad' into jb-mr2-dev
2013-03-21 21:52:17 -07:00
c1c3e03c12
am 140b6705: Merge "Fix appname"
...
* commit '140b6705ece0559f2ea9647044b3baf6a314f3d3':
Fix appname
2013-03-21 20:45:30 -07:00
140b6705ec
Merge "Fix appname"
2013-03-22 03:42:54 +00:00
4f6804e5b4
Fix appname
...
Bug: 6789579
Change-Id: I224bd1b734f74db31c006601129339c099616ed6
2013-03-22 11:54:35 +09:00
bd7b4fcce0
am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'ee91bde16c34af80201efb5f8d056caecbbbf338':
Clean up InflateException reference from KeyboardBuilder
2013-03-20 23:19:17 -07:00
ee91bde16c
Clean up InflateException reference from KeyboardBuilder
...
Change-Id: If9daa00b6d829ce2069a027e4bfec310ec108615
2013-03-21 12:27:33 +09:00
54f0ae278b
am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'a6fae701e344fcfda01b835c762855140d2de7e9':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 09:48:39 -07:00
a6fae701e3
am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 16:46:50 +00:00
0849a4b9b7
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I6854ee735b15189c2987281e5f0525687dcb3b21
2013-03-20 09:32:58 -07:00
525bbec9ec
am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 04:24:19 +00:00
897af93ff6
Prevent keyboard A11y proxy from referencing a null keyboard view.
...
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
2013-03-19 17:08:52 -07:00
4f11af0c78
am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-19 17:02:14 -07:00
9da7fa0f50
am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '559616fb0c39e2f0bacdf294b84ba16ad1e8f371':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-19 23:59:56 +00:00
559616fb0c
Prevent keyboard A11y proxy from referencing a null keyboard view.
...
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
2013-03-19 13:17:42 -07:00
44346c3549
merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
2013-03-19 15:55:42 +00:00
c1125b6dd1
am a462cd80: Support feedback
...
* commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645':
Support feedback
2013-03-19 01:30:29 -07:00
a462cd80ae
Support feedback
...
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
2013-03-19 17:25:55 +09:00
458f56b679
am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to build
...
* commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7':
Break dependencies to allow offdevice tests to build
2013-03-19 01:15:13 -07:00
3c5b7d4814
am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.
...
* commit '6d90a10a343723b8613fd22d323c586ecc33b284':
Merge the dictionary pack in Latin IME.
2013-03-19 01:15:12 -07:00
Baligh Uddin
The Android Automerger
Satoshi Kataoka
Tadashi G. Takaoka
Alan Viverette
The Android Open Source Project
Jean Chalard