The Android Automerger
361a766f81
merge in jb-mr2-release history after reset to master
2013-02-19 09:52:05 -08:00
Tadashi G. Takaoka
c4932d2616
am da348e11: Fix layout direction of Keyboard and Suggestions view
...
* commit 'da348e11ad43b5eaf70a6bad8551a86cd43a6512':
Fix layout direction of Keyboard and Suggestions view
2013-02-18 00:26:15 -08:00
Tadashi G. Takaoka
da348e11ad
Fix layout direction of Keyboard and Suggestions view
...
Bug: 8167348
Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
2013-02-18 16:32:34 +09:00
Jean Chalard
a2f89c525d
am d4cbc4fd: Implement getting data files with protocol v2
...
* commit 'd4cbc4fd078cbb23be4eafe1cb82a8a470fca3a0':
Implement getting data files with protocol v2
2013-02-15 19:41:27 -08:00
Jean Chalard
d4cbc4fd07
Implement getting data files with protocol v2
...
This also does it for deleting them
Bug: 8167342
Bug: 6789534
Change-Id: I1823f98508881f109a667146d3608003f87aa4cb
2013-02-15 11:09:16 -08:00
Jean Chalard
9cf5e32879
am 4beaab2a: Merge "Determine the protocol version of the dictionary pack"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '4beaab2a88ce616bdc8ca35248d65c1b649943a9':
Determine the protocol version of the dictionary pack
2013-02-14 12:23:53 -08:00
Jean Chalard
4beaab2a88
Merge "Determine the protocol version of the dictionary pack"
2013-02-14 20:22:09 +00:00
The Android Automerger
09f5eff4e9
merge in jb-mr2-release history after reset to master
2013-02-14 05:56:25 -08:00
Tadashi G. Takaoka
65bc373452
am 4c53e144: Merge "Add placeholder of keyboard setup wizard"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4c53e144c184a7b084e9deecf5d1f1fe01ec1af9':
Add placeholder of keyboard setup wizard
2013-02-14 01:05:37 -08:00
Tadashi G. Takaoka
4c53e144c1
Merge "Add placeholder of keyboard setup wizard"
2013-02-14 09:03:45 +00:00
Tadashi G. Takaoka
cb0beaf3f1
Add placeholder of keyboard setup wizard
...
Bug: 8159728
Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
2013-02-14 18:00:11 +09:00
Satoshi Kataoka
ba5d3dac56
am f9097056: Merge "clean up seach key vector"
...
# Via Android (Google) Code Review (1) and Satoshi Kataoka (1)
* commit 'f9097056f2ee5fd9044443963568c15649c7da37':
clean up seach key vector
2013-02-14 00:49:46 -08:00
Satoshi Kataoka
f9097056f2
Merge "clean up seach key vector"
2013-02-14 08:47:53 +00:00
Satoshi Kataoka
e5cdd21102
clean up seach key vector
...
Bug: 8197301
Change-Id: I6a67d2914bd44b3ceca655adcd65c9c42796b026
2013-02-14 17:04:34 +09:00
Jean Chalard
b1f27a2e26
Determine the protocol version of the dictionary pack
...
...for query.
Bug: 8167342
Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
2013-02-13 20:45:36 -08:00
Ken Wakasa
18cd7011f7
am 2834f522: Merge "Prep for GCC 4.6 that will be used in unbundled branches"
...
# Via Android (Google) Code Review (1) and Ken Wakasa (1)
* commit '2834f522b78d57ee862c5444e389a3834ba6de63':
Prep for GCC 4.6 that will be used in unbundled branches
2013-02-13 18:29:04 -08:00
Ken Wakasa
2834f522b7
Merge "Prep for GCC 4.6 that will be used in unbundled branches"
2013-02-14 02:25:06 +00:00
Kurt Partridge
d4d515f4bf
am de3e5fbf: Merge "Cleanup in preparation for tests"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'de3e5fbf9dfb2e4e34095e0c34e8aec8d8de02f5':
Cleanup in preparation for tests
2013-02-13 15:35:50 -08:00
Kurt Partridge
de3e5fbf9d
Merge "Cleanup in preparation for tests"
2013-02-13 23:34:07 +00:00
Jean Chalard
81d09321f8
am d1f80f72: Merge "Clean up dictionary pack presence test."
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'd1f80f72e33f79ae8ed94a279a9969cc238a83a7':
Clean up dictionary pack presence test.
2013-02-13 11:42:08 -08:00
Jean Chalard
d1f80f72e3
Merge "Clean up dictionary pack presence test."
2013-02-13 19:40:11 +00:00
Baligh Uddin
b9f477f5a8
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-13 19:17:12 +00:00
Baligh Uddin
927a485a21
am 4a81b571: (-s ours) Import translations. DO NOT MERGE
...
# Via Baligh Uddin
* commit '4a81b571a330a8e6e0eae29460d5320f85545ac0':
Import translations. DO NOT MERGE
2013-02-13 11:16:17 -08:00
Baligh Uddin
4a81b571a3
Import translations. DO NOT MERGE
...
Change-Id: Ib49331c1511dcc9efac19ceda0b70e3604f30791
Auto-generated-cl: translation import
2013-02-13 10:49:33 -08:00
Baligh Uddin
c63cfa5a99
Import translations. DO NOT MERGE
...
Change-Id: I856a4dac1396dcf20bfa45a53b81829ad8f3468d
Auto-generated-cl: translation import
2013-02-13 10:43:39 -08:00
The Android Automerger
e828d07cbc
merge in jb-mr2-release history after reset to master
2013-02-13 05:56:32 -08:00
Ken Wakasa
d74214d726
Prep for GCC 4.6 that will be used in unbundled branches
...
Change-Id: I31c1d1bc573ee10779efce0f221d378ad758e9ca
2013-02-13 19:56:19 +09:00
Kurt Partridge
531dd150eb
Cleanup in preparation for tests
...
multi-project commit with I1212da392ecda0ad78962da68941870b5a651eee
Change-Id: Ie74af59d4e45bf954723fee9dcf350a36468c381
2013-02-12 20:48:44 -08:00
Jean Chalard
a9df972780
Clean up dictionary pack presence test.
...
This method is much cleaner and much more readable.
Change-Id: I8055c169ef7c4453ab45c463704bd56a6080da4f
2013-02-12 17:59:36 -08:00
Baligh Uddin
a00c83414d
am 69cc3cfe: (-s ours) Import translations. DO NOT MERGE
...
# Via Baligh Uddin
* commit '69cc3cfe1f2fd1ce3bea7752745f4f0c7a35aa3a':
Import translations. DO NOT MERGE
2013-02-12 13:48:23 -08:00
Baligh Uddin
69cc3cfe1f
Import translations. DO NOT MERGE
...
Change-Id: I49fbafa8f9ef932fe4d2354c83fa86514726bb00
Auto-generated-cl: translation import
2013-02-12 13:33:27 -08:00
Baligh Uddin
f60fad3987
Import translations. DO NOT MERGE
...
Change-Id: Ic418597418363ba57704b6d44ea33a862fbc621e
Auto-generated-cl: translation import
2013-02-12 13:28:55 -08:00
Kurt Partridge
97895d1586
am 04de6802: Merge "Add batchMode field to PickSuggestionManually"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '04de6802cc275ac7125ae558e5718c5fab336fca':
Add batchMode field to PickSuggestionManually
2013-02-12 08:56:15 -08:00
Kurt Partridge
04de6802cc
Merge "Add batchMode field to PickSuggestionManually"
2013-02-12 16:54:35 +00:00
The Android Automerger
6227b5abff
merge in jb-mr2-release history after reset to master
2013-02-12 07:11:32 -08:00
Tadashi G. Takaoka
d84c7a871d
am fdb1ca56: Merge "Separate caps mode related utils to CapsModeUtils"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit 'fdb1ca560e426e67c60c7f7324bc52022b1b3f07':
Separate caps mode related utils to CapsModeUtils
2013-02-12 01:28:14 -08:00
Tadashi G. Takaoka
fdb1ca560e
Merge "Separate caps mode related utils to CapsModeUtils"
2013-02-12 09:26:16 +00:00
Tadashi G. Takaoka
ce6bcdd1a5
Separate caps mode related utils to CapsModeUtils
...
Change-Id: I32700c434b296bb3fd39e040c2dda1fe90667daf
2013-02-12 18:15:42 +09:00
Tadashi G. Takaoka
f6716e651f
am 2c2942dd: Merge "Move parseCsvString to StringUtils"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '2c2942dd4bdea8581191866e2f06a0fa9dec18ed':
Move parseCsvString to StringUtils
2013-02-11 23:59:49 -08:00
Tadashi G. Takaoka
2c2942dd4b
Merge "Move parseCsvString to StringUtils"
2013-02-12 07:57:24 +00:00
Tadashi G. Takaoka
b3fd701181
Move parseCsvString to StringUtils
...
Change-Id: I602f33991ca57b6057ec2defe01573552b322857
2013-02-12 16:18:19 +09:00
Jean Chalard
d16059f918
am e26f0d43: Merge "Cleanups"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'e26f0d4320b9f3ad49a5c6d3f5f2ee78bac74a48':
Cleanups
2013-02-11 22:50:51 -08:00
Jean Chalard
e26f0d4320
Merge "Cleanups"
2013-02-12 06:49:41 +00:00
Tadashi G. Takaoka
a869080b04
am 4cbe84ad: Merge "Fix RTL language key code mapping"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4cbe84ad08f38bf9c6f8852b406f5052e862a747':
Fix RTL language key code mapping
2013-02-11 22:45:16 -08:00
Tadashi G. Takaoka
4cbe84ad08
Merge "Fix RTL language key code mapping"
2013-02-12 06:43:40 +00:00
Tadashi G. Takaoka
9a2039d94e
Fix RTL language key code mapping
...
Bug: 8168899
Bug: 8169343
Change-Id: I23120704e97d89d5ddec2b2bdff2a98a6daac4d5
2013-02-12 14:51:54 +09:00
Jean Chalard
1c5b2a41ec
Cleanups
...
Follow-up to Idc6f419a
Change-Id: I4aae8f4e19f27a0a309879dc19af6e40906d58c5
2013-02-11 21:14:56 -08:00
Jean Chalard
08a2bbc738
am c6aaa48e: Merge "Some cleanups"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'c6aaa48ea7fa021112cc163730b5bce574c6877b':
Some cleanups
2013-02-11 21:10:22 -08:00
Jean Chalard
c6aaa48ea7
Merge "Some cleanups"
2013-02-12 05:09:31 +00:00
Tadashi G. Takaoka
41d66bea35
am 0b491917: Add translatable="false" for dictionary-pack.xml
...
# Via Tadashi G. Takaoka
* commit '0b49191797071d6674cae46eea9f76a8947945da':
Add translatable="false" for dictionary-pack.xml
2013-02-11 21:03:22 -08:00