PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,427 Commits 1 Branch 0 Tags
181192235d02e647a161a18ff442367ca8fe7f8f
Commit Graph

10427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
181192235d am 55077df1: am f1d02056: Import translations. DO NOT MERGE 
* commit '55077df18a9bc29171eeb1587ec6c84101e6fa64':
  Import translations. DO NOT MERGE
 2013-07-08 14:38:21 -07:00
Baligh Uddin
369ca5a7b0 am 20a554fa: Import translations. DO NOT MERGE 
* commit '20a554fa50620fc51951a12f16a27f83168f4ce3':
  Import translations. DO NOT MERGE
 2013-07-08 14:38:18 -07:00
Baligh Uddin
55077df18a am f1d02056: Import translations. DO NOT MERGE 
* commit 'f1d02056d967b2660424f181ce547b846a92fdec':
  Import translations. DO NOT MERGE
 2013-07-08 14:35:21 -07:00
Baligh Uddin
20a554fa50 Import translations. DO NOT MERGE 
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
 2013-07-08 09:18:57 -07:00
Baligh Uddin
f1d02056d9 Import translations. DO NOT MERGE 
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
 2013-07-08 09:17:21 -07:00
The Android Open Source Project
d8e00a0ba3 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I1529161d81082d96363ffb02eab90da17a1ec71e
 2013-07-03 14:33:10 -07:00
Baligh Uddin
143d460027 am 8bd9f2f2: am 76185f72: Import translations. DO NOT MERGE 
* commit '8bd9f2f287dec8ff9abb4de1830a1a91fc7212c2':
  Import translations. DO NOT MERGE
 2013-07-03 14:27:40 -07:00
Baligh Uddin
7f49b198d0 am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'df0ad0dc86b41b009943f97956b7a36b00c9eef8':
  Import translations. DO NOT MERGE
 2013-07-03 14:27:39 -07:00
Baligh Uddin
8bd9f2f287 am 76185f72: Import translations. DO NOT MERGE 
* commit '76185f7201b3e8a2d341a62c13f8ac259203a7e7':
  Import translations. DO NOT MERGE
 2013-07-03 14:24:47 -07:00
Baligh Uddin
df0ad0dc86 am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'aa03b2f6a61bc2ea4e7ad9b07a2841363a3a7a73':
  Import translations. DO NOT MERGE
 2013-07-03 14:24:47 -07:00
Baligh Uddin
8db7a8c58e am ad965c17: Import translations. DO NOT MERGE 
* commit 'ad965c173bd5a6f98d14a6e1ef83087cc55bd5ef':
  Import translations. DO NOT MERGE
 2013-07-03 14:21:03 -07:00
Baligh Uddin
ad965c173b Import translations. DO NOT MERGE 
Change-Id: I45c8315e3a471262b48485768ba402b35b559886
Auto-generated-cl: translation import
 2013-07-03 13:56:12 -07:00
Baligh Uddin
76185f7201 Import translations. DO NOT MERGE 
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
 2013-07-03 13:54:27 -07:00
Baligh Uddin
daa0e5ab7a am e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'e462f0d5b9b131523240795c23dc6ec39fb19306':
  Import translations. DO NOT MERGE
 2013-07-02 12:33:11 -07:00
Baligh Uddin
e462f0d5b9 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-02 16:34:32 +00:00
Baligh Uddin
aa03b2f6a6 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 16:34:18 +00:00
The Android Automerger
959821a098 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:33 -07:00
Wink Saville
17f1fa4207 am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings. 
* commit '7319f2b123772d72417cd09e8f3f04441c93d13d':
  Add Manage mobile plan to Settings.
 2013-07-01 16:33:01 -07:00
Wink Saville
7319f2b123 am 5d5a269f: Add Manage mobile plan to Settings. 
* commit '5d5a269f59aa5caa986eff3cb988d7585b2cd43c':
  Add Manage mobile plan to Settings.
 2013-07-01 16:31:35 -07:00
Wink Saville
5d5a269f59 Add Manage mobile plan to Settings. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-07-01 16:27:10 -07:00
Baligh Uddin
e90462d2e3 Import translations. DO NOT MERGE 
Change-Id: I2fb9c2692fa420eee7416690dc768a966ff1a9b9
Auto-generated-cl: translation import
 2013-07-01 09:20:37 -07:00
Baligh Uddin
a2fa332286 Import translations. DO NOT MERGE 
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
 2013-07-01 09:19:04 -07:00
The Android Open Source Project
6ab277ee50 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0
 2013-07-01 07:43:20 -07:00
The Android Automerger
1468b78605 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-30 05:55:34 -07:00
Robert Greenwalt
50702355f2 am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit '5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:08:17 -07:00
Robert Greenwalt
5d3ef5715c am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit 'a1454529c3eb6d0e87b254888abfea3bb714f7fe':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:06:25 -07:00
Robert Greenwalt
a1454529c3 Merge "Dont enable Wi-Fi if it's not toggleable in flight mode" 2013-06-28 15:05:16 +00:00
Johan Redestig
2acaf22ad1 Dont enable Wi-Fi if it's not toggleable in flight mode 
Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c187905

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
 2013-06-28 10:37:07 +02:00
Elliott Hughes
29bed78df6 am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit 'add37ef4f2721bc791319e6794b310cfbd802533':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:59:08 -07:00
Elliott Hughes
add37ef4f2 am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit '5f6e43394dd89432b241f32cd2c96d87c3ad5040':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:55:54 -07:00
Elliott Hughes
5f6e43394d Merge "Use SimpleDateFormat for time zone formatting." 2013-06-27 21:52:24 +00:00
Amith Yamasani
9495b2f937 am 51d2ff75: am bf87f7d7: Fix inconsistent string 
* commit '51d2ff7561dafdb1371c46e5a5f1e0505bdbbb5e':
  Fix inconsistent string
 2013-06-27 14:52:24 -07:00
Amith Yamasani
51d2ff7561 am bf87f7d7: Fix inconsistent string 
* commit 'bf87f7d78d7c09f6b928cc0a33e77c5130436c72':
  Fix inconsistent string
 2013-06-27 14:46:36 -07:00
Amith Yamasani
bf87f7d78d Fix inconsistent string 
Bug: 9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
 2013-06-27 09:41:15 -07:00
The Android Open Source Project
42dc6df115 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ia9e51b0778c662f1da131e33627cacf6356898fc
 2013-06-25 16:13:54 -07:00
Elliott Hughes
81faf895d7 Use SimpleDateFormat for time zone formatting. 
There's no need to do time zone formatting manually.

Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
 2013-06-25 10:16:27 -07:00
Elliott Hughes
2295035a85 am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit 'b17fef801f4c26fdf116d706c3b9e30b522cb229':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:57:43 -07:00
Elliott Hughes
b17fef801f am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit '02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:56:06 -07:00
Elliott Hughes
02e23fb0eb Merge "Clamp date setting for the SetupWizard as well as Settings." 2013-06-25 16:53:21 +00:00
Elliott Hughes
b85d48fa43 Clamp date setting for the SetupWizard as well as Settings. 
We fixed this for Settings in 7ccfa0614c,
but @sonymobile.com point out that it's still broken for SetupWizard.

Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
 2013-06-24 17:24:01 -07:00
The Android Automerger
51248d42a0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-24 14:55:10 -07:00
The Android Automerger
66789bbbca Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:42:16 -07:00
The Android Open Source Project
11f5f98482 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49
 2013-06-21 11:57:15 -07:00
The Android Automerger
623bb0c79e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-21 11:35:55 -07:00
Dianne Hackborn
7f74dea7a8 am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '675710849a1209f929e387b19e3a7705f702f5bd':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:40:57 -07:00
Dianne Hackborn
675710849a am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:39:39 -07:00
Dianne Hackborn
5da4c9079c Merge "Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev 2013-06-20 21:38:30 +00:00
Baligh Uddin
793ed6e051 am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
  Import translations. DO NOT MERGE
 2013-06-20 09:31:52 -07:00
Baligh Uddin
178baecf98 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-06-20 16:27:38 +00:00
Baligh Uddin
86d2f720fb am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE 
* commit 'e0878e357023c260ed41dec8b20da7e9a265b2fa':
  Import translations. DO NOT MERGE
 2013-06-20 08:36:12 -07:00