OSDN Git Service
Geoff Mendal [Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)]
am
f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit '
f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Nov 2013 20:36:00 +0000 (12:36 -0800)]
am
b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit '
b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:18:28 +0000 (12:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Nov 2013 20:55:11 +0000 (12:55 -0800)]
am
d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit '
d82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:32:22 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 Nov 2013 22:07:57 +0000 (14:07 -0800)]
am
c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit '
c3bd608799f2239dfa8d739b2732954e4fd658e5':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 20:40:04 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 21:15:25 +0000 (13:15 -0800)]
am
f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit '
f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:27:32 +0000 (11:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
Jeff Brown [Tue, 19 Nov 2013 03:07:06 +0000 (19:07 -0800)]
am
130118d4: Add help url for remote display.
* commit '
130118d43628c058e3bf82f5d978d383f19390de':
Add help url for remote display.
Jeff Brown [Mon, 18 Nov 2013 20:26:16 +0000 (12:26 -0800)]
Add help url for remote display.
Bug:
11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
91c54aa81849fd60839ac62efb005df390c64438':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
beb9a03b716d152ea25813fca3a93a1ec781a685':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf214892d020d9f310dd583e519bc3e1e8925cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
bug:
11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid. We have already leveraged in TC.
bug:
11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
503b6deff226b12450decd5997111c77bd179a88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Bug:
11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:
11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.
Bug:
11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug
11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am
81ed0438: Finalize assets for screen cast.
* commit '
81ed043857dadcb69885c1e2ac37d63925c56c65':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.
Bug:
11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug:
11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am
a27816dc: merge in release branch changes (no-op).
* commit '
a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug:
11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
Robert Greenwalt [Thu, 7 Nov 2013 18:32:55 +0000 (10:32 -0800)]
am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
29b7a8446a36286bd4311ec2f52281fd1628a86e':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:31:03 +0000 (18:31 +0000)]
Merge "Add batch scan data to power stats." into klp-dev
The Android Automerger [Thu, 7 Nov 2013 14:01:28 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:03:44 +0000 (20:03 -0800)]
am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7d7164361e3e9cf9198fca4050fca81547053b04':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:00:04 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Kenny Root [Wed, 6 Nov 2013 23:11:14 +0000 (15:11 -0800)]
am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
d0de39e716c7d93beeb83f9b442af437be651e55':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 23:09:05 +0000 (23:09 +0000)]
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
Baligh Uddin [Wed, 6 Nov 2013 22:34:35 +0000 (14:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Lifu Tang [Wed, 6 Nov 2013 06:23:01 +0000 (22:23 -0800)]
am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
741bc054243576dcfff17bf3a807dc8732bca332':
Shows LGAAYL when launching Location Settings
Lifu Tang [Wed, 6 Nov 2013 06:20:56 +0000 (06:20 +0000)]
Merge "Shows LGAAYL when launching Location Settings" into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:39:31 +0000 (18:39 -0800)]
am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
5b7111d05db50d479290517b1b459dbcfc178a7f':
Remove line break.
Geoffrey Borggaard [Wed, 6 Nov 2013 02:37:48 +0000 (02:37 +0000)]
Merge "Remove line break." into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:22:58 +0000 (18:22 -0800)]
am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
4e42c80872e3543247913afd270fe5b9950b2969':
Add PAC UI to Wi-Fi Settings
Jason Monk [Wed, 6 Nov 2013 02:20:49 +0000 (02:20 +0000)]
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:15:23 +0000 (15:15 -0800)]
am
1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1bfd35410db22b1f4aabe4ad3f471bedb088584d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:12:13 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Amith Yamasani [Tue, 5 Nov 2013 21:54:00 +0000 (13:54 -0800)]
am
060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
* commit '
060d5fd1727b087094e295481b2633deb33a6616':
Adjust power control widget minWidth to occupy 4 cells.
Amith Yamasani [Tue, 5 Nov 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
Jason Monk [Tue, 5 Nov 2013 16:54:48 +0000 (11:54 -0500)]
Add PAC UI to Wi-Fi Settings
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None. This should only be visible in EDU users as only EDU
has PAC.
Bug:
11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
Geoffrey Borggaard [Tue, 5 Nov 2013 18:10:49 +0000 (13:10 -0500)]
Remove line break.
The "network may be monitored" message had an extra line break.
Bug:
11534572
Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
Kenny Root [Tue, 5 Nov 2013 00:16:08 +0000 (16:16 -0800)]
am
8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev
* commit '
8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
Accessibility: filter touches to Enable button
Kenny Root [Tue, 5 Nov 2013 00:12:19 +0000 (00:12 +0000)]
Merge "Accessibility: filter touches to Enable button" into klp-dev
Baligh Uddin [Mon, 4 Nov 2013 23:23:56 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import
Lifu Tang [Mon, 4 Nov 2013 06:36:00 +0000 (22:36 -0800)]
Shows LGAAYL when launching Location Settings
- Partial fix of b/
10897468
Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
Amith Yamasani [Sat, 2 Nov 2013 00:17:08 +0000 (17:17 -0700)]
Adjust power control widget minWidth to occupy 4 cells.
Bug:
10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
Baligh Uddin [Fri, 1 Nov 2013 14:47:57 +0000 (07:47 -0700)]
am
e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e2b0278fa3ce9f04fdaa3ce690b8e1581a0dbe13':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Nov 2013 14:46:21 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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
Baligh Uddin [Wed, 30 Oct 2013 18:23:02 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import
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: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:19:24 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
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: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: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: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: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: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: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
OSDN Git Service
