Tadashi G. Takaoka
33fa6a0b3b
am cc75c950
: am 73d00e68
: Merge "Use XmlPullParser.getEventType()"
...
* commit 'cc75c950410f206c5bc6406071d256071aeabca9':
Use XmlPullParser.getEventType()
2013-03-27 21:59:46 -07:00
Satoshi Kataoka
dd8ca1f821
am bc586fb1
: am 0b327101
: Merge "Fix possible NPE"
...
* commit 'bc586fb1ff553bc640676b348b3b24ee2626bf42':
Fix possible NPE
2013-03-27 21:59:44 -07:00
Tadashi G. Takaoka
56b1bd866a
am f892f775
: am d17b69ec
: Clean up XmlParserUtils
...
* commit 'f892f7751e1263b71dd1b0a49618f922a16df1ae':
Clean up XmlParserUtils
2013-03-27 21:59:43 -07:00
Baligh Uddin
c1cb476697
am 6537280f
: am 5f976d1c
: (-s ours) am ff41125b
: (-s ours) am fba54597
: Import translations. DO NOT MERGE
...
* commit '6537280fd524c5297dc50079cdbfce8db6f64b75':
2013-03-27 21:59:42 -07:00
Baligh Uddin
fc135df584
am 24daa2a1
: am 6616188e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '24daa2a17c22fb2c2f40f212a3fd96ed77805819':
Import translations. DO NOT MERGE
2013-03-27 21:59:41 -07:00
Baligh Uddin
93c5c7a41d
am 2898aac8
: Import translations. DO NOT MERGE
...
* commit '2898aac8f2692d1b01df1ad70cb6c41a006ab1eb':
Import translations. DO NOT MERGE
2013-03-27 21:59:40 -07:00
Tadashi G. Takaoka
71fb8af7c5
am ec183b50
: am fb658d6c
: Fix possible ArrayIndexOutOfBoundsException
...
* commit 'ec183b50ff1b44390a44ec94f8910373f7dbf985':
Fix possible ArrayIndexOutOfBoundsException
2013-03-27 21:59:39 -07:00
Baligh Uddin
8051fd0d73
am 2a01fc22
: am 1e5add78
: (-s ours) am 7668deec
: (-s ours) am 21160c4e
: Import translations. DO NOT MERGE
...
* commit '2a01fc22d40d00192dd53dd6413ab9cce56d778b':
2013-03-27 21:59:37 -07:00
Baligh Uddin
7f859d683e
am 8636ba03
: am afe343c1
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '8636ba03a7163d4bc2c81b8bddb1152944f9981d':
Import translations. DO NOT MERGE
2013-03-27 21:59:36 -07:00
Baligh Uddin
b4039d9600
am 5709e859
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '5709e859a542493c139911542aec3f3befa3db78':
Import translations. DO NOT MERGE
2013-03-27 21:59:36 -07:00
Alan Viverette
f518e71ad2
am c5ec7545
: am 8f807582
: am e47ee181
: am a7b4398c
: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit 'c5ec75457731f28e9bdadd4e60c13e7b3290e1d8':
2013-03-27 21:48:46 -07:00
Satoshi Kataoka
40be0244bd
am 54b85827
: am 189c1b0e
: am 97ddbf22
: am 19a70087
: Merge "Fix appname"
...
* commit '54b8582760bd818105dfa3a093139f6f24e12219':
2013-03-27 21:48:42 -07:00
Tadashi G. Takaoka
a7353ddac8
am 5a4700a0
: am 0992fd24
: am 1e3c73de
: am 3a8a63c3
: Remove unused import
...
* commit '5a4700a0464be662a8bdde82963ea3c6d5ddefd2':
2013-03-27 21:48:41 -07:00
Tadashi G. Takaoka
56796cd76e
am 4841df87
: am bb679a22
: am 3d0fee4e
: am c6452f25
: Merge "Remove reference to string.english_ime_name"
...
* commit '4841df87de52f7957c60b4c4acba7ce2a6980855':
2013-03-27 21:48:40 -07:00
Satoshi Kataoka
9b969b261c
am 13498620
: am 4bb504ce
: am 45728330
: am f4352c2c
: Merge "Use correct appname resource"
...
* commit '13498620347013cf816e4e08b9fe596a8eb0d961':
2013-03-27 21:48:38 -07:00
Baligh Uddin
f1c2946cc8
am 4021464c
: am 4b66d0c4
: am a01fb001
: am a3e47f87
: am 74089a09
: am ba0e497a
: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit '4021464cba52bf83c5a3397e1ebbcf75d6cb674d':
2013-03-27 21:48:37 -07:00
Satoshi Kataoka
67d1bdd488
am ac2d54b5
: am 0cc63149
: am c1c3e03c
: am 140b6705
: Merge "Fix appname"
...
* commit 'ac2d54b56b4263bedd244242d0e2725bdad8c7c3':
2013-03-27 21:48:36 -07:00
Tadashi G. Takaoka
f510d1542f
am bb0c999b
: am dbb90d08
: am bd7b4fcc
: am ee91bde1
: Clean up InflateException reference from KeyboardBuilder
...
* commit 'bb0c999ba007098adeee0dc7a96d3469a01d734f':
2013-03-27 21:48:34 -07:00
The Android Open Source Project
6ab186a14c
am c4176236
: (-s ours) am 210226c5
: (-s ours) am 54f0ae27
: am a6fae701
: (-s ours) am 0849a4b9
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'c4176236c2ac31a4559a960a9aa9bb934b11bc80':
2013-03-27 21:48:33 -07:00
Alan Viverette
44678fcf23
am f1bcc1d7
: am 9ecac40d
: am 4f11af0c
: am 9da7fa0f
: am 559616fb
: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit 'f1bcc1d7dc783698fede049bfd2e2214edd9d2ad':
2013-03-27 21:48:32 -07:00
Alan Viverette
c5ec754577
am 8f807582
: am e47ee181
: am a7b4398c
: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit '8f8075822645e526b3171ab6cc6a7e5f2c993706':
2013-03-27 21:47:00 -07:00
Satoshi Kataoka
54b8582760
am 189c1b0e
: am 97ddbf22
: am 19a70087
: Merge "Fix appname"
...
* commit '189c1b0ee86350e1f7cf736042cdf74abdef2200':
2013-03-27 21:46:59 -07:00
Tadashi G. Takaoka
5a4700a046
am 0992fd24
: am 1e3c73de
: am 3a8a63c3
: Remove unused import
...
* commit '0992fd245b33828577742238492249f009defde6':
2013-03-27 21:46:58 -07:00
Tadashi G. Takaoka
4841df87de
am bb679a22
: am 3d0fee4e
: am c6452f25
: Merge "Remove reference to string.english_ime_name"
...
* commit 'bb679a224f4daf00d8f65c2903bf90a9253b5e1b':
2013-03-27 21:46:57 -07:00
Satoshi Kataoka
1349862034
am 4bb504ce
: am 45728330
: am f4352c2c
: Merge "Use correct appname resource"
...
* commit '4bb504cedbe3c86f7f54c98afd36e5301ff1c9f9':
2013-03-27 21:46:55 -07:00
Baligh Uddin
4021464cba
am 4b66d0c4
: am a01fb001
: am a3e47f87
: am 74089a09
: am ba0e497a
: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit '4b66d0c483ed1724cd24cfcf959a7b974fc2ef4b':
2013-03-27 21:46:54 -07:00
Satoshi Kataoka
ac2d54b56b
am 0cc63149
: am c1c3e03c
: am 140b6705
: Merge "Fix appname"
...
* commit '0cc63149580a2cc567435173843f3aa653e57a3b':
2013-03-27 21:46:53 -07:00
Tadashi G. Takaoka
bb0c999ba0
am dbb90d08
: am bd7b4fcc
: am ee91bde1
: Clean up InflateException reference from KeyboardBuilder
...
* commit 'dbb90d08b548bc59bec26d464757427cd07a4ef1':
2013-03-27 21:46:51 -07:00
The Android Open Source Project
c4176236c2
am 210226c5
: (-s ours) am 54f0ae27
: am a6fae701
: (-s ours) am 0849a4b9
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '210226c5594249624421a2385ef5410b88de02e4':
2013-03-27 21:46:50 -07:00
Alan Viverette
f1bcc1d7dc
am 9ecac40d
: am 4f11af0c
: am 9da7fa0f
: am 559616fb
: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '9ecac40d8516d57480a0a91ccf1acdffd511266e':
2013-03-27 21:46:49 -07:00
Alan Viverette
8f80758226
am e47ee181
: am a7b4398c
: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit 'e47ee18192554877cd202455cbc3c9e932b86728':
Don't announce changes for A11y within the same keyboard mode.
2013-03-27 21:45:08 -07:00
Satoshi Kataoka
189c1b0ee8
am 97ddbf22
: am 19a70087
: Merge "Fix appname"
...
* commit '97ddbf22d5c6d4791b3115526fdc885a40009695':
Fix appname
2013-03-27 21:45:07 -07:00
Tadashi G. Takaoka
0992fd245b
am 1e3c73de
: am 3a8a63c3
: Remove unused import
...
* commit '1e3c73de06caeeba31cb43099f4555e1ed17dba4':
Remove unused import
2013-03-27 21:45:06 -07:00
Tadashi G. Takaoka
bb679a224f
am 3d0fee4e
: am c6452f25
: Merge "Remove reference to string.english_ime_name"
...
* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
Remove reference to string.english_ime_name
2013-03-27 21:45:05 -07:00
Satoshi Kataoka
4bb504cedb
am 45728330
: am f4352c2c
: Merge "Use correct appname resource"
...
* commit '457283308a2bb929a473086040b402c673aca390':
Use correct appname resource
2013-03-27 21:45:03 -07:00
Baligh Uddin
4b66d0c483
am a01fb001
: am a3e47f87
: am 74089a09
: am ba0e497a
: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit 'a01fb001b4589eb51fdb5bbea8f8210730a57d79':
2013-03-27 21:45:01 -07:00
Satoshi Kataoka
0cc6314958
am c1c3e03c
: am 140b6705
: Merge "Fix appname"
...
* commit 'c1c3e03c12891dfd8a87f1254c8bc9d9ccc9333a':
Fix appname
2013-03-27 21:45:00 -07:00
Tadashi G. Takaoka
dbb90d08b5
am bd7b4fcc
: am ee91bde1
: Clean up InflateException reference from KeyboardBuilder
...
* commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205':
Clean up InflateException reference from KeyboardBuilder
2013-03-27 21:44:59 -07:00
The Android Open Source Project
210226c559
am 54f0ae27
: am a6fae701
: (-s ours) am 0849a4b9
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '54f0ae278b49eb1d1147cdabc3c391fb5c4f869b':
2013-03-27 21:44:58 -07:00
Alan Viverette
9ecac40d85
am 4f11af0c
: am 9da7fa0f
: am 559616fb
: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '4f11af0c783718f3b899d1ccb15f9ddfd9ba1070':
2013-03-27 21:44:57 -07:00
Baligh Uddin
0cd02c2bd7
keep history after reset to jb-ub-latinimegoogle-azuki
2013-03-27 21:30:40 -07:00
Jean Chalard
a050834cdc
am 11b600b9
: (-s ours) am 2f73105a
: (-s ours) am db5e07f7
: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit '11b600b9091bc4d00f861d46c2ff95f2c2aa07d2':
[DO NOT MERGE] Increase string limits
2013-03-27 21:12:25 -07:00
Jean Chalard
6e78878f7b
am 844e5014
: Merge "Increase string limits"
...
* commit '844e5014fa789df85a8b02cab9665b6d867fa720':
Increase string limits
2013-03-27 21:09:12 -07:00
Jean Chalard
11b600b909
am 2f73105a
: (-s ours) am db5e07f7
: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit '2f73105a862cf97148ecd5fdaa25da9f0b98f32a':
[DO NOT MERGE] Increase string limits
2013-03-27 21:08:33 -07:00
Jean Chalard
844e5014fa
Merge "Increase string limits"
2013-03-28 04:07:24 +00:00
Jean Chalard
2f73105a86
am db5e07f7
: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit 'db5e07f75633ee89631bd6903378884b84bc1242':
[DO NOT MERGE] Increase string limits
2013-03-27 21:06:15 -07:00
Jean Chalard
db5e07f756
Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
2013-03-28 04:04:28 +00:00
Jean Chalard
eda69e5272
Increase string limits
...
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
2013-03-28 13:03:49 +09:00
Jean Chalard
830cd7b915
[DO NOT MERGE] Increase string limits
...
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
2013-03-28 13:01:41 +09:00
Baligh Uddin
f980ec6c5b
am fc801fe8
: (-s ours) am c57cf2b7
: (-s ours) am 841e6016
: Import translations. DO NOT MERGE
...
* commit 'fc801fe8f82128634b3e4a11dcb259592768ae6e':
Import translations. DO NOT MERGE
2013-03-27 14:54:42 -07:00