OSDN Git Service
Satoshi Kataoka [Thu, 31 Oct 2013 22:13:47 +0000 (15:13 -0700)]
am
67b3039d: am
2cab1344: am
aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '
67b3039d37c0ca4b4314129bb151183fde614aed':
Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:10:17 +0000 (15:10 -0700)]
am
2cab1344: am
aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '
2cab1344037ada26710047138b59c2f8f0f4dfee':
Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:07:11 +0000 (15:07 -0700)]
am
aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '
aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
Fix a bug on updating enabled IMEs
Satoshi Kataoka [Wed, 30 Oct 2013 20:35:45 +0000 (13:35 -0700)]
Fix a bug on updating enabled IMEs
Bug:
11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
Chris Wren [Tue, 29 Oct 2013 19:05:13 +0000 (12:05 -0700)]
am
ed4c3aac: am
455bf4d3: am
1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '
ed4c3aacfb020886d420299523059b37abd3f415':
remove lockscreen widget checkbox when there's no lockscreen.
Chris Wren [Tue, 29 Oct 2013 19:01:47 +0000 (12:01 -0700)]
am
455bf4d3: am
1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '
455bf4d3395e828dfbeca1f2ef5696e960874ad1':
remove lockscreen widget checkbox when there's no lockscreen.
Chris Wren [Tue, 29 Oct 2013 18:59:53 +0000 (11:59 -0700)]
am
1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '
1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
remove lockscreen widget checkbox when there's no lockscreen.
Chris Wren [Tue, 29 Oct 2013 16:30:35 +0000 (12:30 -0400)]
remove lockscreen widget checkbox when there's no lockscreen.
Bug:
11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
Baligh Uddin [Tue, 29 Oct 2013 03:51:41 +0000 (20:51 -0700)]
am
91d3ccff: (-s ours) am
31735215: (-s ours) am
b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit '
91d3ccffeb48963b06864730fbca03755588d0fc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:48:12 +0000 (20:48 -0700)]
am
31735215: (-s ours) am
b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit '
317352151ba7e84be66a01f5c8c2585ea1aacb6f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:44:53 +0000 (20:44 -0700)]
am
b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit '
b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 22:23:39 +0000 (15:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic475e167a5d113bae5f55cadb821237be30e919c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 28 Oct 2013 22:19:24 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
Baligh Uddin [Sat, 26 Oct 2013 03:30:23 +0000 (03:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Fri, 25 Oct 2013 23:14:01 +0000 (16:14 -0700)]
am
8cd39351: am
bd5cbb04: am
fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit '
8cd39351fe9d1164a06bb4420e2b95c5dd9259fb':
remove primary condition check on storage format.
Jeff Sharkey [Fri, 25 Oct 2013 22:06:12 +0000 (15:06 -0700)]
am
bd5cbb04: am
fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit '
bd5cbb0400366faade3586e19f1deae2350c0ddd':
remove primary condition check on storage format.
Jeff Sharkey [Fri, 25 Oct 2013 22:02:50 +0000 (15:02 -0700)]
am
fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit '
fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
remove primary condition check on storage format.
Jeff Sharkey [Fri, 25 Oct 2013 22:00:07 +0000 (22:00 +0000)]
Merge "remove primary condition check on storage format." into klp-dev
Pierre [Wed, 23 Oct 2013 18:33:35 +0000 (11:33 -0700)]
remove primary condition check on storage format.
this change seemed to have been introduced originally
via commit
d2a6f28fa7ba8189d2a1987129db27fd840fac0f
as a workaround to fix interoperability problem with MTP,
then commit
8218d3ba180505a52998caa1fd9f6a1647984e7f
seemed to have address this problem.
therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.
Bug:
11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com>
Andrew Flynn [Fri, 25 Oct 2013 19:55:22 +0000 (19:55 +0000)]
Merge "Check for presence of carrier app in Mobile Plan."
Baligh Uddin [Fri, 25 Oct 2013 19:26:39 +0000 (12:26 -0700)]
am
c42d3174: (-s ours) am
0728400a: (-s ours) am
9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c42d3174675ba909df526af3daec07bbc83c94df':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Oct 2013 19:25:00 +0000 (12:25 -0700)]
am
0728400a: (-s ours) am
9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
0728400a7943303b26d0f60e52050dc1fb496c68':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Oct 2013 19:22:49 +0000 (12:22 -0700)]
am
9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9271875c129d000a98a7a1fcd11f09041f26455c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Oct 2013 19:21:06 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 25 Oct 2013 18:44:06 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I485d5d31cfd721f5bec653c6d131fb89cfa628b6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Oct 2013 18:40:25 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import
Zhihai Xu [Fri, 25 Oct 2013 18:19:37 +0000 (11:19 -0700)]
am
f8ac9d60: am
c9c92647: am
cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit '
f8ac9d60d4da1a467e02b658d08f3d140f074390':
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
Zhihai Xu [Fri, 25 Oct 2013 18:17:15 +0000 (11:17 -0700)]
am
c9c92647: am
cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit '
c9c92647d1ab0f75c9f7a499e05fd556c96fa128':
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
Zhihai Xu [Fri, 25 Oct 2013 18:15:55 +0000 (11:15 -0700)]
am
cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit '
cb9d32e55f68446a3e696b0bd9f553f7d5d14dc4':
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
Zhihai Xu [Fri, 25 Oct 2013 18:12:48 +0000 (18:12 +0000)]
Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
Wink Saville [Fri, 25 Oct 2013 16:54:35 +0000 (09:54 -0700)]
am
b557b89c: am
01b7ae29: am
83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '
b557b89c4dde4c760b1ce7c6317d3077378692e0':
Display remaining attempts when using or changing SIM PIN
Wink Saville [Fri, 25 Oct 2013 16:49:34 +0000 (09:49 -0700)]
am
01b7ae29: am
83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '
01b7ae29600f934d491cdc6dafdacf22821baf8d':
Display remaining attempts when using or changing SIM PIN
Wink Saville [Fri, 25 Oct 2013 16:46:29 +0000 (09:46 -0700)]
am
83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '
83671ff815f59a977b34297c94aa05b4b4e97d01':
Display remaining attempts when using or changing SIM PIN
Wink Saville [Fri, 25 Oct 2013 16:41:08 +0000 (16:41 +0000)]
Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
Baligh Uddin [Thu, 24 Oct 2013 03:39:58 +0000 (20:39 -0700)]
am
acc23ef6: (-s ours) am
315e78bd: (-s ours) am
2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
acc23ef6995a567e3d14f827940748af2e439025':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Oct 2013 03:38:22 +0000 (20:38 -0700)]
am
315e78bd: (-s ours) am
2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
315e78bd4d033e777426a46952a752d724278f18':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Oct 2013 03:35:30 +0000 (20:35 -0700)]
am
2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2ba4985526779a52826b933597b7817952e1d0a0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Oct 2013 03:33:38 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Oct 2013 03:33:34 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 24 Oct 2013 02:54:57 +0000 (19:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I654010b903a3b8bb4cec6a288250380bd93070e0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 24 Oct 2013 02:50:57 +0000 (19:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import
Wink Saville [Thu, 24 Oct 2013 00:07:10 +0000 (17:07 -0700)]
Display remaining attempts when using or changing SIM PIN
Bug:
9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
Vineeta Srivastava [Wed, 23 Oct 2013 23:17:13 +0000 (16:17 -0700)]
am
4a66909a: am
7a40def1: am
47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '
4a66909a6aae9d35ebc13fb377a41e525bd0f6c9':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
John Spurlock [Wed, 23 Oct 2013 23:17:12 +0000 (16:17 -0700)]
am
d947e49b: am
ada38ffa: am
311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit '
d947e49b02ba7d8d47263b94893d85067ae0c3ad':
Inherit translucent bars in keyguard widget picker.
Vineeta Srivastava [Wed, 23 Oct 2013 23:14:35 +0000 (16:14 -0700)]
am
7a40def1: am
47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '
7a40def17c40279faf8ad01d730c88498cd2f549':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
John Spurlock [Wed, 23 Oct 2013 23:14:35 +0000 (16:14 -0700)]
am
ada38ffa: am
311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit '
ada38ffa3b8dca416a169d57061d2b1bdfc0cfdc':
Inherit translucent bars in keyguard widget picker.
Vineeta Srivastava [Wed, 23 Oct 2013 23:11:45 +0000 (16:11 -0700)]
am
47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '
479634248d2c9833d7315a6382f491460f48da0f':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
John Spurlock [Wed, 23 Oct 2013 23:11:44 +0000 (16:11 -0700)]
am
311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit '
311a78455a75955b53412abcd0c41872e20f686e':
Inherit translucent bars in keyguard widget picker.
Vineeta Srivastava [Wed, 23 Oct 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
Sungmin Choi [Tue, 15 Oct 2013 23:11:55 +0000 (16:11 -0700)]
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.
Bug:
10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
John Spurlock [Wed, 23 Oct 2013 15:47:52 +0000 (15:47 +0000)]
Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
John Spurlock [Tue, 22 Oct 2013 20:12:12 +0000 (16:12 -0400)]
Inherit translucent bars in keyguard widget picker.
Bug:
11337231
Change-Id: Ie65d5474328cec859637ba7771da5e93509236ae
Baligh Uddin [Tue, 22 Oct 2013 20:05:41 +0000 (13:05 -0700)]
am
b57eee78: (-s ours) am
5dd4a096: (-s ours) am
7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b57eee78248f02ac483daaeaa75248ecab9ecfd6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Oct 2013 20:03:32 +0000 (13:03 -0700)]
am
5dd4a096: (-s ours) am
7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5dd4a09679b373927f459a9daccd4ba87badb366':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Oct 2013 20:00:31 +0000 (13:00 -0700)]
am
7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7fe57374cdb67b19b98d0170e10add876f0823b1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Oct 2013 19:54:15 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 22 Oct 2013 19:54:11 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Lifu Tang [Mon, 21 Oct 2013 23:06:09 +0000 (16:06 -0700)]
am
7077e646: am
75099b67: am
cace3d8d: Modified the strings according to the specs
* commit '
7077e6460e393e567d3b80da6190ff1ebe7d834a':
Modified the strings according to the specs
Lifu Tang [Mon, 21 Oct 2013 23:03:20 +0000 (16:03 -0700)]
am
75099b67: am
cace3d8d: Modified the strings according to the specs
* commit '
75099b672338213e9f74462cd9ff96dd51bdd9d5':
Modified the strings according to the specs
Lifu Tang [Mon, 21 Oct 2013 23:00:32 +0000 (16:00 -0700)]
am
cace3d8d: Modified the strings according to the specs
* commit '
cace3d8d28f005e6226a3eb909f8ebc3668ef805':
Modified the strings according to the specs
Baligh Uddin [Mon, 21 Oct 2013 18:08:18 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import
Baligh Uddin [Mon, 21 Oct 2013 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
Zhihai Xu [Sun, 20 Oct 2013 06:37:35 +0000 (23:37 -0700)]
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
bug:
11303213
Change-Id: I1f227839931872ba6fdca0b5932a24e0b002ec44
Lifu Tang [Sat, 19 Oct 2013 00:42:08 +0000 (17:42 -0700)]
Modified the strings according to the specs
- Fix b/
11290711
Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
Zhihai Xu [Fri, 18 Oct 2013 18:57:56 +0000 (11:57 -0700)]
am
ce62f3ef: am
592ed214: am
55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
ce62f3efc05fe515a93cc6c368eb37be6a8657c1':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 18 Oct 2013 18:55:21 +0000 (11:55 -0700)]
am
592ed214: am
55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
592ed21459e543dc70c3845e808834d3226492cb':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 18 Oct 2013 18:54:03 +0000 (11:54 -0700)]
am
55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
55f03857b7ebe7663cf4873d059afced15e30081':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 18 Oct 2013 18:51:16 +0000 (18:51 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Satoshi Kataoka [Fri, 18 Oct 2013 18:24:03 +0000 (11:24 -0700)]
am
544db7fa: (-s ours) am
56f47bf1: am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
544db7fad02457d96ae0d69fb458cf7c10f03b1c':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:21:32 +0000 (11:21 -0700)]
am
56f47bf1: am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
56f47bf11bb041eff3333c9047a6ebef5d50a59e':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:18:29 +0000 (11:18 -0700)]
am
ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit '
ea90cd2fca08e5c65e54d8df1c208337e08fc541':
Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Do not merge. Refresh "InputMethodPreference"s onResume
Corresponding change is I015075d57ebed94d6b
Bug:
11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Refresh "InputMethodPreference"s onResume
Bug:
11245599
Change-Id: I015075d57ebed94d6b76a66de135ee748e27e3a6
Zhihai Xu [Fri, 18 Oct 2013 00:11:38 +0000 (17:11 -0700)]
BT keeps on asking me if I want to allow car to do stuff
Persist the "no" count
bug:
11176511
Change-Id: I39674334fe8bf09d1f3f2b07c12513a6c46f053b
Baligh Uddin [Thu, 17 Oct 2013 21:40:48 +0000 (14:40 -0700)]
am
e9e80ada: (-s ours) am
3796a55e: (-s ours) am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
e9e80ada85bb124df6b9ede805a349e345a84bb3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:33:37 +0000 (14:33 -0700)]
am
3796a55e: (-s ours) am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:31:54 +0000 (14:31 -0700)]
am
2496a32c: (-s ours) Import translations. DO NOT MERGE
* commit '
2496a32ca67270e5570f97b780ae47aade080e0d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:30:00 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 21:21:57 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 17:28:56 +0000 (10:28 -0700)]
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
Baligh Uddin [Thu, 17 Oct 2013 17:27:16 +0000 (10:27 -0700)]
am
2fa95373: (-s ours) am
025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2fa95373a5b8f7e2753f396240cad9f2615d3b3e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:25:29 +0000 (10:25 -0700)]
am
025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
025b6ecff220b3117b892df1d9f4bd35a4fb4527':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:21:38 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Oct 2013 17:21:34 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 17 Oct 2013 06:18:02 +0000 (23:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 06:13:11 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
Zhihai Xu [Thu, 17 Oct 2013 02:35:03 +0000 (19:35 -0700)]
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
Zhihai Xu [Thu, 17 Oct 2013 02:31:52 +0000 (19:31 -0700)]
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
Zhihai Xu [Thu, 17 Oct 2013 02:29:49 +0000 (19:29 -0700)]
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
Zhihai Xu [Thu, 17 Oct 2013 02:27:10 +0000 (02:27 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 01:02:13 +0000 (18:02 -0700)]
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.
Ed Heyl [Thu, 17 Oct 2013 00:56:40 +0000 (17:56 -0700)]
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.
Ed Heyl [Thu, 17 Oct 2013 00:52:06 +0000 (17:52 -0700)]
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.
Ed Heyl [Thu, 17 Oct 2013 00:46:24 +0000 (17:46 -0700)]
merge in klp-release (no-op)
Christopher Tate [Wed, 16 Oct 2013 20:46:45 +0000 (13:46 -0700)]
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
Christopher Tate [Wed, 16 Oct 2013 20:43:46 +0000 (13:43 -0700)]
am
a31d8b71: am
235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '
a31d8b7194793a2ef01f36bd07d70043762de02e':
User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:41:43 +0000 (13:41 -0700)]
am
235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '
235e5d686fc73cfd82605bac86dcc9673916c5b7':
User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:24:36 +0000 (13:24 -0700)]
User ID, not uid, in an EXTRA_USER_HANDLE
Bug
11208808
Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
Zhihai Xu [Tue, 15 Oct 2013 18:27:54 +0000 (11:27 -0700)]
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
The Android Automerger [Tue, 15 Oct 2013 13:01:17 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
OSDN Git Service
