The Android Automerger
c78664ba6a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-06 05:55:56 -07:00
Baligh Uddin
b7065916e2
am dd8197bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dd8197bcb249c800299e0fa34ffac9170dee0a76':
Import translations. DO NOT MERGE
2013-05-04 17:18:38 -07:00
Baligh Uddin
dd8197bcb2
Import translations. DO NOT MERGE
...
Change-Id: I838674303010d6bff9e3a6f747fd265d1c82baac
Auto-generated-cl: translation import
2013-05-03 16:52:20 -07:00
Baligh Uddin
7e29d9c547
Import translations. DO NOT MERGE
...
Change-Id: Ic8b86f95be92b8b07a85c6981a5dbc1d5c7afea4
Auto-generated-cl: translation import
2013-05-03 16:47:55 -07:00
Baligh Uddin
6939f8dcae
Import translations. DO NOT MERGE
...
Change-Id: I92ead720c4713c9022dc65255f6b6fba1ee80b4d
Auto-generated-cl: translation import
2013-05-03 16:46:10 -07:00
Baligh Uddin
b55b15c3bd
Import translations. DO NOT MERGE
...
Change-Id: I5c8c885e2971d73ffa5a8ac45dd39dd836c935c8
Auto-generated-cl: translation import
2013-05-03 16:44:22 -07:00
Ken Wakasa
4c7474d501
am c5a29fa8
: Revert "Fix exact match profanity"
...
* commit 'c5a29fa864b5d7589fbbe8ddc96f2c7a0c7cee28':
Revert "Fix exact match profanity"
2013-05-02 07:23:10 -07:00
Ken Wakasa
c5a29fa864
Revert "Fix exact match profanity"
...
This reverts commit df2eae6e69
Change-Id: I42635cc09ad3ea4c177d02e0b7607fb7aa78506c
2013-05-02 14:21:29 +00:00
The Android Automerger
6c9b0a297d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-02 05:55:44 -07:00
Tadashi G. Takaoka
a36266dd58
am a5be033d
: Preserve setup wizard step while orientation change
...
* commit 'a5be033d4a7a141615e7d784f9218a476a10e018':
Preserve setup wizard step while orientation change
2013-05-02 03:23:59 -07:00
Tadashi G. Takaoka
a5be033d4a
Preserve setup wizard step while orientation change
...
Bug: 8159728
Change-Id: I596f59749443b8878b5613285f0fe793d449cdbd
2013-05-02 18:42:10 +09:00
Tadashi G. Takaoka
9bb189f613
am 7d19ab5c
: Using int instead of booleans to save keyboard shift state
...
* commit '7d19ab5c9d20cb71f9892a147a854809eb20ca49':
Using int instead of booleans to save keyboard shift state
2013-05-02 00:38:44 -07:00
Tadashi G. Takaoka
7d19ab5c9d
Using int instead of booleans to save keyboard shift state
...
This is a follow up of Ib2bc262aac.
Bug: 8734294
Change-Id: I0b56797ffc4f16e18da72352777fe0f000d173aa
2013-05-02 16:21:39 +09:00
Tadashi G. Takaoka
3c1a18c6a6
am 7f8dd50b
: Save automatic shift state while orientation changing
...
* commit '7f8dd50b8fe38738e52511e1d0bf082172b8932d':
Save automatic shift state while orientation changing
2013-05-02 00:18:51 -07:00
Tadashi G. Takaoka
7f8dd50b8f
Save automatic shift state while orientation changing
...
Bug: 8734294
Change-Id: Ib2bc262aacedf786a318c2fe1bd4420a21e7d847
2013-05-02 15:48:56 +09:00
Baligh Uddin
276ed0d6a7
am 9e0ffd35
: (-s ours) am f9a4732e
: (-s ours) am f7e4057f
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '9e0ffd35a534ee5c2f81bcb2685fd997243ea406':
Import translations. DO NOT MERGE
2013-05-01 20:50:10 -07:00
Baligh Uddin
2ff23cb7cf
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-azuki
2013-05-02 03:48:05 +00:00
Baligh Uddin
9e0ffd35a5
am f9a4732e
: (-s ours) am f7e4057f
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f9a4732e3baa2fdc6a27a1488cdb6f00a4f685d8':
Import translations. DO NOT MERGE
2013-05-01 20:47:19 -07:00
Baligh Uddin
1df2efcf4c
Import translations. DO NOT MERGE
...
Change-Id: Ie8b2c6a3426c3ca42759acfea2315ab1b7d0a918
Auto-generated-cl: translation import
2013-05-01 20:47:10 -07:00
Baligh Uddin
11d4d24081
am 39b3bf8d
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '39b3bf8df110eb8be3d61a64bb050ebb7546ac38':
Import translations. DO NOT MERGE
2013-05-01 20:46:59 -07:00
Baligh Uddin
e351e10a68
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-05-02 03:46:49 +00:00
Baligh Uddin
39b3bf8df1
Merge "Import translations. DO NOT MERGE"
2013-05-02 03:45:45 +00:00
Baligh Uddin
f9a4732e3b
am f7e4057f
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f7e4057f22c5226c0a11b0aec2e30c387ab9f285':
Import translations. DO NOT MERGE
2013-05-01 20:45:38 -07:00
Baligh Uddin
dde8e9e371
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-05-02 03:44:34 +00:00
Baligh Uddin
f7e4057f22
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-02 03:43:55 +00:00
Baligh Uddin
5c3c9ca6e6
Import translations. DO NOT MERGE
...
Change-Id: Ie0357e3c5e84878d7ae8f57fcf02220fb22badda
Auto-generated-cl: translation import
2013-05-01 20:43:38 -07:00
Tadashi G. Takaoka
cd196fd5e9
am 307f49b8
: Mark some unit tests as @MediumTest
...
* commit '307f49b8c1e954cfcba4f12ff74b22803825ca15':
Mark some unit tests as @MediumTest
2013-05-01 19:28:54 -07:00
Tadashi G. Takaoka
307f49b8c1
Mark some unit tests as @MediumTest
...
Change-Id: Iaa0a691903526f57510a0305c02cc42cf8d90f9e
2013-05-02 11:25:35 +09:00
Satoshi Kataoka
25a713d62c
am 11b9f680
: (-s ours) am e5daf660
: (-s ours) am 6845427e
: DO NOT MERGE: Return possible suggestions in Google Spell Checker
...
* commit '11b9f680d0c779a27d12084027b9d55a940c3837':
DO NOT MERGE: Return possible suggestions in Google Spell Checker
2013-05-01 18:41:11 -07:00
Satoshi Kataoka
11b9f680d0
am e5daf660
: (-s ours) am 6845427e
: DO NOT MERGE: Return possible suggestions in Google Spell Checker
...
* commit 'e5daf6608affeb5be000c1c5dad69772ec247a6e':
DO NOT MERGE: Return possible suggestions in Google Spell Checker
2013-05-01 18:39:06 -07:00
Satoshi Kataoka
e5daf6608a
am 6845427e
: DO NOT MERGE: Return possible suggestions in Google Spell Checker
...
* commit '6845427e5d48fe48f837cd96a52c209be5f40357':
DO NOT MERGE: Return possible suggestions in Google Spell Checker
2013-05-01 18:37:23 -07:00
Baligh Uddin
3985e632ad
Import translations. DO NOT MERGE
...
Change-Id: I3f66d23846516560e3a1e316cf56dc7a17dfe9e2
Auto-generated-cl: translation import
2013-05-01 14:35:47 -07:00
Baligh Uddin
27ff23b174
Import translations. DO NOT MERGE
...
Change-Id: I2496a62033d7aa97d4be5bea712e3fb52586816e
Auto-generated-cl: translation import
2013-05-01 14:31:47 -07:00
Baligh Uddin
9df098a758
Import translations. DO NOT MERGE
...
Change-Id: I229b7ae4865c40d4b96fe5b2ef2fa3b8bf90db7c
Auto-generated-cl: translation import
2013-05-01 14:30:02 -07:00
Baligh Uddin
cd6806d2d9
Import translations. DO NOT MERGE
...
Change-Id: I840f5e7a7f140fbf5ccf27371077b2d8c86506c2
Auto-generated-cl: translation import
2013-05-01 14:28:20 -07:00
The Android Automerger
c41237d97d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:56:05 -07:00
Jean Chalard
d8e5527701
am 83757d43
: Merge "Pass blockOffensiveWords as a parameter"
...
* commit '83757d439ea15c5304a048868edb16d5ef7fd5cb':
Pass blockOffensiveWords as a parameter
2013-05-01 04:59:07 -07:00
Jean Chalard
83757d439e
Merge "Pass blockOffensiveWords as a parameter"
2013-05-01 11:57:36 +00:00
Jean Chalard
2dbb5957e3
Pass blockOffensiveWords as a parameter
...
Bug: 8773353
Change-Id: Ic1019742ce7ff6e4f7fff4d2729f8ab52d841488
2013-05-01 20:47:35 +09:00
Ken Wakasa
56550ee5c3
am 1490b534
: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
...
* commit '1490b534162cc5f99e2a1ed93c63a1fa4045e5ca':
Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 04:25:44 -07:00
Ken Wakasa
1490b53416
Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
...
Change-Id: Icb89c5119a67edaa019d5f7645b734cfcfc29041
2013-05-01 20:19:05 +09:00
Satoshi Kataoka
6845427e5d
DO NOT MERGE: Return possible suggestions in Google Spell Checker
...
Bug: 8772531
By the change in the suggestion algorithm, the pruning of the suggestions is not required anymore. This has been fixed in master branch properly.
Change-Id: I6ab9da953d69ff726d2bc328c09064e6ade0dcea
2013-05-01 20:18:55 +09:00
Satoshi Kataoka
483fc6f1ff
am c43417fb
: Fix build
...
* commit 'c43417fb5d037d49c49176ed92f995b74b861d3e':
Fix build
2013-05-01 03:24:26 -07:00
Satoshi Kataoka
c43417fb5d
Fix build
...
Change-Id: Ib9373b26b04b0f4789b3cd6a7af64e4bcd2c4b9c
2013-05-01 19:01:36 +09:00
Jean Chalard
3eee5cd24b
am 53b37dc0
: Merge "Fix a layout problem for pre-MR2"
...
* commit '53b37dc098daf99151bf1b38d04bd202f8a3ba03':
Fix a layout problem for pre-MR2
2013-05-01 02:57:26 -07:00
Jean Chalard
53b37dc098
Merge "Fix a layout problem for pre-MR2"
2013-05-01 09:56:00 +00:00
Jean Chalard
b15e822234
Fix a layout problem for pre-MR2
...
...where marginStart is not supported yet.
Change-Id: Id4f642333c17d091b1ab36549ca580f4572d3bf4
2013-05-01 18:45:24 +09:00
Satoshi Kataoka
3ac40c6ae4
am 1641a4a4
: Merge "Fix Google spell checker tests"
...
* commit '1641a4a4576e73bbf0218178c885f448d669b472':
Fix Google spell checker tests
2013-05-01 02:33:29 -07:00
Satoshi Kataoka
1641a4a457
Merge "Fix Google spell checker tests"
2013-05-01 09:31:52 +00:00
Satoshi Kataoka
d5781eef62
Fix Google spell checker tests
...
Bug: 8613307
Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 18:21:56 +09:00