Jean Chalard
|
4ddfde7b38
|
am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit 'a050834cdc5aff4c85db256f2992e67a02e23de2':
|
2013-04-03 19:21:07 -07:00 |
|
Jean Chalard
|
a747d76285
|
am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '6e78878f7b038afa46afc75117cd773e2d181a5c':
Increase string limits
|
2013-04-03 19:21:06 -07:00 |
|
Baligh Uddin
|
108ee45228
|
am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit 'f980ec6c5bc7452b4e1c6c312fea8b6eb169b2ae':
|
2013-04-03 19:21:04 -07:00 |
|
Baligh Uddin
|
c1283003f5
|
am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '6e0e8dd6d0706a128cc69cb4578227c8df6a2a44':
Import translations. DO NOT MERGE
|
2013-04-03 19:21:03 -07:00 |
|
Baligh Uddin
|
0b227bb961
|
am 57b68207: Import translations. DO NOT MERGE
* commit '57b682074820805a19eee151bf54e73508262d08':
Import translations. DO NOT MERGE
|
2013-04-03 19:21:02 -07:00 |
|
Satoshi Kataoka
|
395e500b09
|
am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
Fix Possible NPE
|
2013-04-03 19:21:01 -07:00 |
|
Satoshi Kataoka
|
0c99a379bd
|
am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'e42522f33566857402a8db645f58de2818456dc7':
Fix possible SIOOBE
|
2013-04-03 19:21:00 -07:00 |
|
Kurt Partridge
|
35e02ccdda
|
am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit 'bf62dc036f1e71751c8713ff13e686bbf635d6c3':
Close ResearchLogger upon onFinishInputView
|
2013-04-03 19:20:59 -07:00 |
|
The Android Open Source Project
|
62adeccdca
|
am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '577f08a3d76343f67f6f68c4f8198557e73939dd':
|
2013-04-03 19:20:58 -07:00 |
|
The Android Open Source Project
|
229537407a
|
Reconcile with jb-mr2-release - do not merge
Change-Id: I00b5f6a7f1d9578933c846c7614eae3bff5b85f0
|
2013-04-03 16:43:45 -07:00 |
|
Baligh Uddin
|
370070ae6b
|
am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '4cdb7ccb325db33fa812855b6ea6de2533cdb6be':
Import translations. DO NOT MERGE
|
2013-04-03 15:34:22 -07:00 |
|
Baligh Uddin
|
4cdb7ccb32
|
Import translations. DO NOT MERGE
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
|
2013-04-03 13:06:22 -07:00 |
|
The Android Automerger
|
1a65d4684b
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-04-02 09:19:17 -07:00 |
|
Jean-Baptiste Queru
|
5bcb3876e2
|
Merge 2caa1d81ce - do not merge
Change-Id: I49fb6693ae1231235b91c48058bf9d3daa74e38f
|
2013-04-02 07:49:43 -07:00 |
|
Baligh Uddin
|
2caa1d81ce
|
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
2013-04-01 20:53:56 +00:00 |
|
Jean Chalard
|
b8869ec1e3
|
am 0fcc4960: Deactivate hardware keyboard handling.
* commit '0fcc4960bcd037b7e1482098f85342743eb2ddee':
Deactivate hardware keyboard handling.
|
2013-04-01 05:40:07 -07:00 |
|
Jean Chalard
|
0fcc4960bc
|
Deactivate hardware keyboard handling.
Bug: 8000119
Change-Id: I021481343d6d87efd8ff6110e9aa0906a1a3d11d
|
2013-04-01 21:35:45 +09:00 |
|
Baligh Uddin
|
cea6a7a2a3
|
Import translations. DO NOT MERGE
Change-Id: I19c04b125fc3d2a6dd7b0a32ee90f098d931f83b
Auto-generated-cl: translation import
|
2013-03-29 21:21:20 -07:00 |
|
The Android Open Source Project
|
b35915fb50
|
Reconcile with jb-mr2-release - do not merge
Change-Id: Iba9f399b20d62611002d4353e00355b2550dbb1d
|
2013-03-29 09:49:25 -07:00 |
|
The Android Automerger
|
0574e46c73
|
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2013-03-28 05:56:26 -07:00 |
|
Baligh Uddin
|
78b07d8b57
|
am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '0cd02c2bd732383766099aa2ec94abc8a8ac174a':
|
2013-03-27 22:05:16 -07:00 |
|
Baligh Uddin
|
5bcbc21a59
|
am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'c08b8245d92107f7300267e3d04ff302dfdb4281':
Import translations. DO NOT MERGE
|
2013-03-27 22:05:16 -07:00 |
|
The Android Automerger
|
a02de1f71d
|
am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '5c3d51e28cad4075faf639a16a7e8a3c8d50c6f0':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-03-27 21:59:47 -07:00 |
|
Tadashi G. Takaoka
|
8b120b985e
|
am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '50cc14b5495f8a712296a21517efe9e405a2322c':
Add const_cast to live with host's jni.h
|
2013-03-27 21:59:47 -07:00 |
|
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
|
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 |
|