Baligh Uddin
e9e80ada85
am 3796a55e
: (-s ours) am 2496a32c
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
Import translations. DO NOT MERGE
2013-10-17 14:33:37 -07:00
Baligh Uddin
3796a55ed2
am 2496a32c
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2496a32ca67270e5570f97b780ae47aade080e0d':
Import translations. DO NOT MERGE
2013-10-17 14:31:54 -07:00
Baligh Uddin
2b22e29f3e
Import translations. DO NOT MERGE
...
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
2013-10-17 14:30:00 -07:00
Baligh Uddin
2496a32ca6
Import translations. DO NOT MERGE
...
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
2013-10-17 14:21:57 -07:00
Baligh Uddin
bb11d35b75
am fba7df30
: (-s ours) am 2fa95373
: (-s ours) am 025b6ecf
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'fba7df3034a3470b32e01653dfad0aca200ac3ae':
Import translations. DO NOT MERGE
2013-10-17 10:28:56 -07:00
Baligh Uddin
fba7df3034
am 2fa95373
: (-s ours) am 025b6ecf
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2fa95373a5b8f7e2753f396240cad9f2615d3b3e':
Import translations. DO NOT MERGE
2013-10-17 10:27:16 -07:00
Baligh Uddin
2fa95373a5
am 025b6ecf
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '025b6ecff220b3117b892df1d9f4bd35a4fb4527':
Import translations. DO NOT MERGE
2013-10-17 10:25:29 -07:00
Baligh Uddin
6ccf477d91
Merge "Import translations. DO NOT MERGE"
2013-10-17 17:21:38 +00:00
Baligh Uddin
025b6ecff2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-17 17:21:34 +00:00
Baligh Uddin
d093024297
Import translations. DO NOT MERGE
...
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
2013-10-16 23:18:02 -07:00
Baligh Uddin
50a64d9dcf
Import translations. DO NOT MERGE
...
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
2013-10-16 23:13:11 -07:00
Zhihai Xu
0b4aec4d7b
am e7f63626
: am 820e7010
: am 3f90a454
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit 'e7f636264b769918ca46148f1db1038d1cd84830':
BT keeps on asking me if I want to allow car to do stuff
2013-10-16 19:35:03 -07:00
Zhihai Xu
e7f636264b
am 820e7010
: am 3f90a454
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit '820e70102e61e290a59ad545f42fac4336aa4e9c':
BT keeps on asking me if I want to allow car to do stuff
2013-10-16 19:31:52 -07:00
Zhihai Xu
820e70102e
am 3f90a454
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit '3f90a454480c227e58300f8c6fb88cc022ff237e':
BT keeps on asking me if I want to allow car to do stuff
2013-10-16 19:29:49 -07:00
Zhihai Xu
3f90a45448
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
2013-10-17 02:27:10 +00:00
Ed Heyl
18997d9eed
am bc6aa63a
: am 5af7e568
: am 67390aad
: merge in klp-release (no-op)
...
* commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
2013-10-16 18:02:13 -07:00
Ed Heyl
bc6aa63a1a
am 5af7e568
: am 67390aad
: merge in klp-release (no-op)
...
* commit '5af7e568115097a6759f6bfc11620690944381c8':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
2013-10-16 17:56:40 -07:00
Ed Heyl
5af7e56811
am 67390aad
: merge in klp-release (no-op)
...
* commit '67390aad4f8a091dc14ea825ede292f8a52efb47':
updated launcher settings icon to gray gear
Load account type icons in a background thread before scrolling down
Updated de-blued backgrounds for settings power widget.
Add print job settings screen.
2013-10-16 17:52:06 -07:00
Ed Heyl
67390aad4f
merge in klp-release (no-op)
2013-10-16 17:46:24 -07:00
Christopher Tate
605a49867a
am 06c0a90d
: am a31d8b71
: am 235e5d68
: User ID, not uid, in an EXTRA_USER_HANDLE
...
* commit '06c0a90d7805a8fdce4156af839a6e4d14b33702':
User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:46:45 -07:00
Christopher Tate
06c0a90d78
am a31d8b71
: am 235e5d68
: User ID, not uid, in an EXTRA_USER_HANDLE
...
* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:43:46 -07:00
Christopher Tate
a31d8b7194
am 235e5d68
: User ID, not uid, in an EXTRA_USER_HANDLE
...
* commit '235e5d686fc73cfd82605bac86dcc9673916c5b7':
User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:41:43 -07:00
Christopher Tate
235e5d686f
User ID, not uid, in an EXTRA_USER_HANDLE
...
Bug 11208808
Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
2013-10-16 13:27:27 -07:00
Kenny Root
94d4f23dcc
Accessibility: filter touches to Enable button
...
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.
Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-10-16 10:10:47 -07:00
Zhihai Xu
3fd5e2839f
BT keeps on asking me if I want to allow car to do stuff
...
remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:11176511
Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316
2013-10-15 11:27:54 -07:00
The Android Automerger
89f46886e4
merge in klp-release history after reset to klp-dev
2013-10-15 06:01:17 -07:00
Torne (Richard Coles)
deb0a156bb
Resolved conflicts for merge of 67e72aa4
to master
...
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
2013-10-15 13:37:35 +01:00
Torne (Richard Coles)
67e72aa49e
am 9880646e
: am f88e5442
: Merge "Remove experimental WebView setting." into klp-dev
...
* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
Remove experimental WebView setting.
2013-10-15 03:37:07 -07:00
Torne (Richard Coles)
9880646e19
am f88e5442
: Merge "Remove experimental WebView setting." into klp-dev
...
* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
Remove experimental WebView setting.
2013-10-15 03:34:15 -07:00
Torne (Richard Coles)
f88e5442f5
Merge "Remove experimental WebView setting." into klp-dev
2013-10-15 10:31:46 +00:00
Baligh Uddin
9e9d6cd33f
am 81d0f1b9
: (-s ours) am 9f9a9652
: (-s ours) am 740702ce
: (-s ours) Import translations. DO NOT MERGE
...
* commit '81d0f1b93c9e1be59546a5efa875202378efacbe':
Import translations. DO NOT MERGE
2013-10-14 20:01:30 -07:00
Baligh Uddin
81d0f1b93c
am 9f9a9652
: (-s ours) am 740702ce
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9f9a9652099204c2e15f1c1660e6886162932943':
Import translations. DO NOT MERGE
2013-10-14 19:01:01 -07:00
Yuhao Zheng
b8b3f5bee0
Merge "Refresh peer list when entering wifi p2p settings"
2013-10-15 00:25:28 +00:00
Baligh Uddin
9f9a965209
am 740702ce
: (-s ours) Import translations. DO NOT MERGE
...
* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
Import translations. DO NOT MERGE
2013-10-14 17:19:28 -07:00
Baligh Uddin
13ccffdb6b
Merge "Import translations. DO NOT MERGE"
2013-10-14 22:54:01 +00:00
Baligh Uddin
548de33483
Import translations. DO NOT MERGE
...
Change-Id: If06a2397c8b907b0593374a89ad2d22bc53382c1
Auto-generated-cl: translation import
2013-10-14 15:30:24 -07:00
Baligh Uddin
740702ced3
Import translations. DO NOT MERGE
...
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
2013-10-14 15:24:56 -07:00
Baligh Uddin
829ef8c55b
am ce4a93f3
: (-s ours) am fea253e0
: (-s ours) am 37473121
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ce4a93f3f4c8ef5c8f2b099f667ad41bcce2e3d2':
Import translations. DO NOT MERGE
2013-10-14 10:50:16 -07:00
Baligh Uddin
63aa0f9411
am d7e8a7f8
: (-s ours) am 84c377f5
: (-s ours) am 9c861f80
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd7e8a7f813376e0e33e9be4031047ec5ae0c8eb4':
Import translations. DO NOT MERGE
2013-10-14 10:48:34 -07:00
Baligh Uddin
8a81a66078
am 7508ef29
: (-s ours) am 8dd824b6
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7508ef29dc4fd823048a3dfc4053a0dea2191c5c':
Import translations. DO NOT MERGE
2013-10-14 10:48:34 -07:00
Torne (Richard Coles)
0bf324c628
Remove experimental WebView setting.
...
The experimental WebView is no longer experimental; remove the setting
from the settings app.
Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00
The Android Automerger
9ece30cb75
merge in klp-release history after reset to klp-dev
2013-10-13 06:02:42 -07:00
Baligh Uddin
ce4a93f3f4
am fea253e0
: (-s ours) am 37473121
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fea253e00a835ed876211dba9d0f37edc9f162e9':
Import translations. DO NOT MERGE
2013-10-12 06:46:01 -07:00
Baligh Uddin
fea253e00a
am 37473121
: (-s ours) Import translations. DO NOT MERGE
...
* commit '37473121937ad62b616e849e21954cf39583e465':
Import translations. DO NOT MERGE
2013-10-12 06:43:48 -07:00
Baligh Uddin
04e9687144
Import translations. DO NOT MERGE
...
Change-Id: I61a6ed38ca7f23682f15d452b199e57f3dc4b632
Auto-generated-cl: translation import
2013-10-12 00:59:55 -07:00
Baligh Uddin
3747312193
Import translations. DO NOT MERGE
...
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
2013-10-12 00:56:01 -07:00
Baligh Uddin
d7e8a7f813
am 84c377f5
: (-s ours) am 9c861f80
: (-s ours) Import translations. DO NOT MERGE
...
* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
Import translations. DO NOT MERGE
2013-10-11 15:03:27 -07:00
Baligh Uddin
7508ef29dc
am 8dd824b6
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
Import translations. DO NOT MERGE
2013-10-11 15:03:26 -07:00
Baligh Uddin
84c377f51a
am 9c861f80
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9c861f80a2f87d007c7bce7493a154d33702f785':
Import translations. DO NOT MERGE
2013-10-11 15:01:27 -07:00
Baligh Uddin
36d4eb83c8
Import translations. DO NOT MERGE
...
Change-Id: Ifa7a23156b38840d7807de126a8eb3d556ac95ff
Auto-generated-cl: translation import
2013-10-11 14:56:37 -07:00