Commit graph

11491 commits

Author SHA1 Message Date
Jean Chalard
bb94c6430b am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '5b2485901b5fff6c63d846e27af7a80ab183d6f3':
2013-04-03 19:34:05 -07:00
Baligh Uddin
ca8ea43197 am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'a3ed3254a7aec469b4e902ef4fc78d4194bb17b3':
2013-04-03 19:34:04 -07:00
Baligh Uddin
94065faf7d am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'c66608308ddcca599b0ad739e3ba46a096bf1871':
2013-04-03 19:34:03 -07:00
The Android Automerger
ccc3c23238 am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '228e26f7c72a9642b20fb35000aa5204a51eedaf':
2013-04-03 19:34:01 -07:00
Tadashi G. Takaoka
b58432221c am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '62b07bf948e01c6490fe2a639b9f8987bd0fd29a':
2013-04-03 19:34:00 -07:00
Tadashi G. Takaoka
9c59fb54e5 am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'fc0fc52122b155a13aaae7803390cc4b0b5b0a45':
2013-04-03 19:33:59 -07:00
Satoshi Kataoka
71f1b27097 am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit '8138c8d21ff69a65059b7a53b717e9b6630e68c3':
2013-04-03 19:33:58 -07:00
Tadashi G. Takaoka
5283b90ae3 am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '60083e3e90b99257b1c88b76c8514d7ec4eca804':
2013-04-03 19:33:56 -07:00
Baligh Uddin
6626fb255b am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '51c7dbea68bb84006728ee6c5d3ba9df85ce277d':
2013-04-03 19:33:55 -07:00
Baligh Uddin
1e8d1f418f am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit 'd72347f919620292274f2d543261fc78b6e82d0f':
2013-04-03 19:33:54 -07:00
Baligh Uddin
38f2bbb392 am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '210d473d53971a2cf897b8951f1dc27881ad7545':
2013-04-03 19:33:53 -07:00
Tadashi G. Takaoka
5eb7a00e4e am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '1047bf17a7e80c451432e24128a7b7d718ca450f':
2013-04-03 19:33:51 -07:00
Baligh Uddin
9768703147 am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '0ad31c8dc8cfda027a92b194b18fed65db7292ab':
2013-04-03 19:33:50 -07:00
Baligh Uddin
3a97d38816 am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '273a21ca53f65ed562c82f3be2c90e4766b867ae':
2013-04-03 19:33:49 -07:00
Baligh Uddin
9f291d17c6 am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '2f8e381be049ee1084fda06d3b1385d098e60bf3':
2013-04-03 19:33:47 -07:00
Jean Chalard
5b2485901b am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '1c63efc9759190e29b9c7120e6b2a66162c5410d':
2013-04-03 19:31:23 -07:00
Baligh Uddin
a3ed3254a7 am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '05b7988a74333ecdcd88090efa224190aeabecd9':
2013-04-03 19:31:22 -07:00
Baligh Uddin
c66608308d am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit '68a0afc3b99cf8281cf09f3697ff3368ac0d4cf7':
2013-04-03 19:31:20 -07:00
The Android Automerger
228e26f7c7 am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'ea46fdcb7b086a3a9c0ce05dec3d041df943784b':
2013-04-03 19:31:19 -07:00
Tadashi G. Takaoka
62b07bf948 am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '561a04f3140ef701c6477d890d8a841c97cb19bf':
2013-04-03 19:31:18 -07:00
Tadashi G. Takaoka
fc0fc52122 am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'e01d1960a2793c083eded84182ba402cf272bdf9':
2013-04-03 19:31:17 -07:00
Satoshi Kataoka
8138c8d21f am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'f4f4d6c939a42c110f1acb32f43134cdc31127c1':
2013-04-03 19:31:16 -07:00
Tadashi G. Takaoka
60083e3e90 am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '49d59d4a9a792cfd606da9fbd8c5d635010e6277':
2013-04-03 19:31:14 -07:00
Baligh Uddin
51c7dbea68 am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '4379dbea4a0eba2dd2c69fb26a77899e74848dae':
2013-04-03 19:31:13 -07:00
Baligh Uddin
d72347f919 am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '67f7bb2e58d206dd4de048c6d32fd072c7dffa67':
2013-04-03 19:31:12 -07:00
Baligh Uddin
210d473d53 am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit 'a62edb475dd75724939085271e6bebad0173b259':
2013-04-03 19:31:11 -07:00
Tadashi G. Takaoka
1047bf17a7 am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '32d89afaf6554e6b50cf6ee9468483d20f08be0e':
2013-04-03 19:31:09 -07:00
Baligh Uddin
0ad31c8dc8 am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit 'a5bc58acccbe881f1fc07151a774b24ece88dd4f':
2013-04-03 19:31:08 -07:00
Baligh Uddin
273a21ca53 am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '772dfa51deaa3632015196b9f95513f8ef6d33c9':
2013-04-03 19:31:07 -07:00
Baligh Uddin
2f8e381be0 am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '92adcda67601cba0f9b634db5f8bb1ab82c3520b':
2013-04-03 19:31:05 -07:00
Alan Viverette
80a2e25162 am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit '14f65cffc5cef6ed9ba6e30fc505794a44f5dd13':
2013-04-03 19:28:27 -07:00
Satoshi Kataoka
745725e144 am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '103b111866f3f9bc06b444f4ad67825db22a83f1':
2013-04-03 19:28:25 -07:00
Tadashi G. Takaoka
5f81bb8cd8 am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '3ef47fd3dee01aafc715555285ce2c61aa64f5c3':
2013-04-03 19:28:24 -07:00
Tadashi G. Takaoka
02a59e551a am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '1f722ca9be13b889572dcabd62eac19d9ff7b59a':
2013-04-03 19:28:22 -07:00
Satoshi Kataoka
793763268e am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit 'f555b25503c4628c90f19ae3bd8684aaede3b335':
2013-04-03 19:28:21 -07:00
Baligh Uddin
307d2aa218 am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '8e48a61891f274aa791469b0ae92ae5eb2a430c7':
2013-04-03 19:28:20 -07:00
Satoshi Kataoka
9f419592ff am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit 'c3c1b4db786a379345209ac0046ec1b5cab55d0c':
2013-04-03 19:28:18 -07:00
Tadashi G. Takaoka
c61393c8ef am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '56642281573a89d96f13f1861ffbd7461f870079':
2013-04-03 19:28:17 -07:00
The Android Open Source Project
5517262476 am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: 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 'b2c2ce310cdb3218b5198f4135a8dfac0d9c14cb':
2013-04-03 19:28:15 -07:00
Alan Viverette
046a311a13 am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit 'd19c71d98432f57b2c84d5741b8f2f27cb1b1f28':
2013-04-03 19:28:14 -07:00
Jean Chalard
dee08de2c5 am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit '724ff2980d429e62557df73d588be2d678175716':
2013-04-03 19:28:13 -07:00
Jean Chalard
2cb50a05cd am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '93465ea3bbf1a24df861f0fd599e02df1775dfb7':
2013-04-03 19:28:12 -07:00
Baligh Uddin
e7edb56174 am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '1368eeee15a7d1378139baec9e085b25fe32039c':
2013-04-03 19:28:10 -07:00
Baligh Uddin
781195f438 am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '119eaf7a2742504fbaac65665e5c3a64fcfe5339':
2013-04-03 19:28:09 -07:00
Baligh Uddin
41db26ed18 am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '68889f1c3485b2eb2404e34f2da9df350700363e':
2013-04-03 19:28:08 -07:00
Satoshi Kataoka
e3c0cca463 am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'e8a3e96447e367714d0ea8c91907573e0694c168':
2013-04-03 19:28:07 -07:00
Satoshi Kataoka
d6f56350fc am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '619d1f73d4eda2c235fe45ac9fa1441719545f3e':
2013-04-03 19:28:05 -07:00
Kurt Partridge
3012c891ba am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '867b2380b97e379c34db3e76a7eaf0521ebbe12c':
2013-04-03 19:28:04 -07:00
The Android Open Source Project
e72a088fe2 am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'a6dcb55eabfdfe68699a91b5bbf26616dd569b8f':
2013-04-03 19:28:03 -07:00
Jean Chalard
1c63efc975 am a657afc3: am d555a0d7: Merge "Cleanup"
* commit 'a657afc32e099d1b12516788e1a32d1303ced295':
  Cleanup
2013-04-03 19:27:11 -07:00