OSDN Git Service
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>
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: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: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: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: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:34 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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: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: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:11 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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: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: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: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
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: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: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: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:34 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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: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 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: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
Torne (Richard Coles) [Tue, 15 Oct 2013 10:37:07 +0000 (03:37 -0700)]
am
9880646e: am
f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '
9880646e197331b99ba9824b7d47f12391c82bf4':
Remove experimental WebView setting.
Torne (Richard Coles) [Tue, 15 Oct 2013 10:34:15 +0000 (03:34 -0700)]
am
f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '
f88e5442f5d2492d415864d1cd118d610b0005d0':
Remove experimental WebView setting.
Torne (Richard Coles) [Tue, 15 Oct 2013 10:31:46 +0000 (10:31 +0000)]
Merge "Remove experimental WebView setting." into klp-dev
Baligh Uddin [Tue, 15 Oct 2013 02:01:01 +0000 (19:01 -0700)]
am
9f9a9652: (-s ours) am
740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '
9f9a9652099204c2e15f1c1660e6886162932943':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Oct 2013 00:19:28 +0000 (17:19 -0700)]
am
740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '
740702ced3d69f3c0b8208ace86e88e4a76ccba0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 22:24:56 +0000 (15:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
Torne (Richard Coles) [Mon, 14 Oct 2013 16:35:43 +0000 (17:35 +0100)]
Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.
Bug:
10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
The Android Automerger [Sun, 13 Oct 2013 13:02:42 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Baligh Uddin [Sat, 12 Oct 2013 13:46:01 +0000 (06:46 -0700)]
am
fea253e0: (-s ours) am
37473121: (-s ours) Import translations. DO NOT MERGE
* commit '
fea253e00a835ed876211dba9d0f37edc9f162e9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 13:43:48 +0000 (06:43 -0700)]
am
37473121: (-s ours) Import translations. DO NOT MERGE
* commit '
37473121937ad62b616e849e21954cf39583e465':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 07:56:01 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 22:03:27 +0000 (15:03 -0700)]
am
84c377f5: (-s ours) am
9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '
84c377f51a0995b2f70028df12abb9f98c44e915':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:03:26 +0000 (15:03 -0700)]
am
8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '
8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:01:27 +0000 (15:01 -0700)]
am
9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '
9c861f80a2f87d007c7bce7493a154d33702f785':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 21:51:44 +0000 (14:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 21:47:56 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
Zhihai Xu [Fri, 11 Oct 2013 21:10:13 +0000 (14:10 -0700)]
am
cf71c2d3: am
83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
cf71c2d3e31375fa68fd65f1ec39fcce62a4b4c3':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 11 Oct 2013 21:06:13 +0000 (14:06 -0700)]
am
83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '
83936d967d0e880401843161feda649c5bd96bc1':
BT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 11 Oct 2013 21:02:51 +0000 (21:02 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Dianne Hackborn [Fri, 11 Oct 2013 19:50:07 +0000 (12:50 -0700)]
am
4f00b368: am
b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '
4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
Allow tapping on memory status regions to filter proc stats.
Zhihai Xu [Fri, 11 Oct 2013 19:15:19 +0000 (12:15 -0700)]
BT keeps on asking me if I want to allow car to do stuff
We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.
bug:
11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f
Dianne Hackborn [Fri, 11 Oct 2013 18:59:51 +0000 (11:59 -0700)]
am
b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '
b1e33884190732a58bfbfe659898e02d41fe39f4':
Allow tapping on memory status regions to filter proc stats.
Dianne Hackborn [Fri, 11 Oct 2013 18:50:34 +0000 (11:50 -0700)]
Allow tapping on memory status regions to filter proc stats.
Change-Id: Iade56907df648a95600919578154635c49ac9dce
Baligh Uddin [Fri, 11 Oct 2013 15:30:50 +0000 (08:30 -0700)]
am
bcdb5eec: (-s ours) am
6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '
bcdb5eec863be4b46b608bda586c889760afba0a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:27:19 +0000 (08:27 -0700)]
am
6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '
6e96aff5546f02199cf4c8aba0bae132d7d35e43':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 15:27:07 +0000 (08:27 -0700)]
am
3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '
3104c1ce9fd8e06e5c380898b1e9f017825c996a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 08:17:11 +0000 (01:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 08:12:20 +0000 (01:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
David Christie [Thu, 10 Oct 2013 23:05:36 +0000 (16:05 -0700)]
am
df0698e9: am
6d6d4976: Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
* commit '
df0698e9f655718743c2d065eae481f1f9d1aba3':
Change location settings icons from crosshair to pin -b/
8142654
David Christie [Thu, 10 Oct 2013 22:39:06 +0000 (15:39 -0700)]
am
6d6d4976: Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
* commit '
6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
Change location settings icons from crosshair to pin -b/
8142654
David Christie [Thu, 10 Oct 2013 22:28:31 +0000 (22:28 +0000)]
Merge "Change location settings icons from crosshair to pin -b/
8142654" into klp-dev
Svetoslav [Thu, 10 Oct 2013 17:17:46 +0000 (10:17 -0700)]
am
43b8946f: am
d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '
43b8946fb3071a1454aa17c352a34c2d389c096e':
Coalescing multiple print job notifications (Settings)
Svetoslav [Thu, 10 Oct 2013 17:14:27 +0000 (10:14 -0700)]
am
d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '
d9f156ddf072775c894db1ca3c3fe8989be4dbeb':
Coalescing multiple print job notifications (Settings)
The Android Automerger [Thu, 10 Oct 2013 13:01:39 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Svetoslav [Thu, 10 Oct 2013 04:59:04 +0000 (21:59 -0700)]
Coalescing multiple print job notifications (Settings)
We used to show a single notificaiton for every print job but
this is against th UX guidelines. Since we have to lead by
example, this change adds coalescing of multiple notifications.
bug:
11155212
Change-Id: I865450495e7e85bd6620c1f42aeef07d2f83a01a
Alan Viverette [Wed, 9 Oct 2013 20:31:04 +0000 (13:31 -0700)]
am
b371444b: am
16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '
b371444b2fee94045ea97c7f4e97a08610595d61':
Fix caption settings picker layouts
Alan Viverette [Wed, 9 Oct 2013 20:29:08 +0000 (13:29 -0700)]
am
16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '
16ad57483d7bba6f5c05ffd64431a900c400eff5':
Fix caption settings picker layouts
Alan Viverette [Wed, 9 Oct 2013 20:25:09 +0000 (20:25 +0000)]
Merge "Fix caption settings picker layouts" into klp-dev
Dianne Hackborn [Wed, 9 Oct 2013 19:21:42 +0000 (12:21 -0700)]
am
c2d73bed: am
02099910: Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
* commit '
c2d73bed9d1ed3cac7236bc9bf7b247871c9285d':
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
Dianne Hackborn [Wed, 9 Oct 2013 19:18:10 +0000 (12:18 -0700)]
am
02099910: Fix issue #
11033002: Percentages in proc stats details are not rounded correctly
* commit '
020999103b34860a89576cd5dba862009337e9a9':
Fix issue #
11033002: Percentages in proc stats details are not rounded correctly