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 |
|
The Android Automerger
|
ea46fdcb7b
|
am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '65dfe94d56e48e1990db66d59cbbeddc31e270a7':
|
2013-04-03 19:27:07 -07:00 |
|
Tadashi G. Takaoka
|
561a04f314
|
am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '1911c513a719b05eb4919eb944fcbf71a0a0d78e':
|
2013-04-03 19:27:06 -07:00 |
|
Tadashi G. Takaoka
|
e01d1960a2
|
am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'c17e0bbad19688d8b40da5b4ef5763e3af3ed999':
|
2013-04-03 19:27:05 -07:00 |
|
Satoshi Kataoka
|
f4f4d6c939
|
am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'b343817399d33e6f460d705bff3adb87cff91964':
|
2013-04-03 19:27:04 -07:00 |
|
Tadashi G. Takaoka
|
49d59d4a9a
|
am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit 'a469cdfe50ddeb188ad7dc203c6d187403609a6f':
|
2013-04-03 19:27:02 -07:00 |
|
Baligh Uddin
|
4379dbea4a
|
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 '324b1880ab719dfdf08c401e28ccde3e6e552782':
|
2013-04-03 19:27:01 -07:00 |
|
Baligh Uddin
|
67f7bb2e58
|
am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '284d428535d5902fa459640d4e465f15473eaa9c':
|
2013-04-03 19:27:00 -07:00 |
|
Baligh Uddin
|
a62edb475d
|
am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '3d082f1bbfeaf396385ac0da5ad2834ee5ed4c27':
|
2013-04-03 19:26:58 -07:00 |
|
Tadashi G. Takaoka
|
32d89afaf6
|
am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit 'e2ccd61be43201c1bf49a88755034faba8a50323':
|
2013-04-03 19:26:57 -07:00 |
|
Baligh Uddin
|
a5bc58accc
|
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 '5301db94f03ce61b9767a5781f396f879f617f56':
|
2013-04-03 19:26:56 -07:00 |
|
Baligh Uddin
|
772dfa51de
|
am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'ae8b69fd101b19e77b3f1f545f893576a56cb475':
|
2013-04-03 19:26:55 -07:00 |
|
Baligh Uddin
|
92adcda676
|
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 '42c255c2b6793cd1f517951dd854f17ec27bd1e9':
|
2013-04-03 19:26:54 -07:00 |
|
Alan Viverette
|
14f65cffc5
|
am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit '8e5fa88a008287cce56ca20f1a148efd0e564e4c':
|
2013-04-03 19:24:19 -07:00 |
|
Satoshi Kataoka
|
103b111866
|
am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '33c91be35a97dec4ee258d84bda49fd723034cbf':
|
2013-04-03 19:24:18 -07:00 |
|
Tadashi G. Takaoka
|
3ef47fd3de
|
am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit 'e0aa93833968d0ab07ba61ba5fbef123de8bb7d1':
|
2013-04-03 19:24:16 -07:00 |
|
Tadashi G. Takaoka
|
1f722ca9be
|
am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '4e627c214d35728777ff9d358abf75ef900de7aa':
|
2013-04-03 19:24:15 -07:00 |
|
Satoshi Kataoka
|
f555b25503
|
am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '5d33d2c2d88cd6385cea7b48f9b79a1f4947298a':
|
2013-04-03 19:24:14 -07:00 |
|
Baligh Uddin
|
8e48a61891
|
am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '18e45a9394ca4932b7e657b27a32983e5235dcda':
|
2013-04-03 19:24:13 -07:00 |
|
Satoshi Kataoka
|
c3c1b4db78
|
am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '5d9459df0fa3f8c9534e9b52565013d7a4c8541e':
|
2013-04-03 19:24:11 -07:00 |
|
Tadashi G. Takaoka
|
5664228157
|
am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit 'd7bcc52d1f0460317498298b27b049f15e0d8120':
|
2013-04-03 19:24:10 -07:00 |
|
The Android Open Source Project
|
b2c2ce310c
|
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 '7de82b0e35362dbaaa0be1e2aab20343c0b0d77b':
|
2013-04-03 19:24:09 -07:00 |
|
Alan Viverette
|
d19c71d984
|
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 '3c082157c00e323ce3ad6fa811afbde3054f2755':
|
2013-04-03 19:24:08 -07:00 |
|
Jean Chalard
|
724ff2980d
|
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 '4ddfde7b38b00365d75727b674648072db657b47':
|
2013-04-03 19:24:06 -07:00 |
|
Jean Chalard
|
93465ea3bb
|
am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'a747d76285a94111485eceda9011141ffe738294':
|
2013-04-03 19:24:05 -07:00 |
|
Baligh Uddin
|
1368eeee15
|
am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '108ee45228ee1a17195cd0b86b2e29ed0c4181e5':
|
2013-04-03 19:24:04 -07:00 |
|
Baligh Uddin
|
119eaf7a27
|
am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit 'c1283003f53fd6b14727ff8ec46801176845a769':
|
2013-04-03 19:24:03 -07:00 |
|
Baligh Uddin
|
68889f1c34
|
am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '0b227bb9619c12f635bdc67b915d8f3babe28b36':
Import translations. DO NOT MERGE
|
2013-04-03 19:24:02 -07:00 |
|
Satoshi Kataoka
|
e8a3e96447
|
am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '395e500b0905880e59c9e1b2442b37702a0ab78a':
|
2013-04-03 19:24:01 -07:00 |
|
Satoshi Kataoka
|
619d1f73d4
|
am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '0c99a379bd7eca152fa600a6ab4c214482270625':
|
2013-04-03 19:23:59 -07:00 |
|
Kurt Partridge
|
867b2380b9
|
am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '35e02ccdda43bb40cf95bca5ec0d96e55848d862':
|
2013-04-03 19:23:58 -07:00 |
|
The Android Open Source Project
|
a6dcb55eab
|
am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '62adeccdcab0c41d502214f31c7a0fa333638e13':
|
2013-04-03 19:23:57 -07:00 |
|
Alan Viverette
|
8e5fa88a00
|
am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit 'f518e71ad276678ef891fe7819b6ca9376609190':
|
2013-04-03 19:21:20 -07:00 |
|
Satoshi Kataoka
|
33c91be35a
|
am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '40be0244bd15c41a3eff33f00108e84c626ad13b':
|
2013-04-03 19:21:18 -07:00 |
|
Tadashi G. Takaoka
|
e0aa938339
|
am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit 'a7353ddac8bd206501714a72c62c15c5a8f8f3c7':
|
2013-04-03 19:21:17 -07:00 |
|
Tadashi G. Takaoka
|
4e627c214d
|
am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '56796cd76efe9fa63b62cd075725b4d754eb430c':
|
2013-04-03 19:21:16 -07:00 |
|
Satoshi Kataoka
|
5d33d2c2d8
|
am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '9b969b261cdb57f6c17154742be03a2b617ad41d':
|
2013-04-03 19:21:15 -07:00 |
|
Baligh Uddin
|
18e45a9394
|
am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit 'f1c2946cc8b24b9b845f8b6b8c37f18f7bed0449':
|
2013-04-03 19:21:13 -07:00 |
|
Satoshi Kataoka
|
5d9459df0f
|
am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '67d1bdd48812a382d859c79ea9f48c6551f616a5':
|
2013-04-03 19:21:12 -07:00 |
|