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

10771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f9ee312b4e am ff2b0d7f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':
 2013-07-08 15:48:50 -07:00
The Android Open Source Project
ff2b0d7f79 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
 2013-07-08 15:37:19 -07:00
Baligh Uddin
c541fcbf60 am 18119223: (-s ours) am 55077df1: am f1d02056: Import translations. DO NOT MERGE 
* commit '181192235d02e647a161a18ff442367ca8fe7f8f':
  Import translations. DO NOT MERGE
 2013-07-08 14:40:59 -07:00
Baligh Uddin
82a1d34e6c am 369ca5a7: (-s ours) am 20a554fa: Import translations. DO NOT MERGE 
* commit '369ca5a7b07963a77ab2f7c323a552d2c247b401':
  Import translations. DO NOT MERGE
 2013-07-08 14:40:58 -07:00
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
12c8b64cdc Import translations. DO NOT MERGE 
Change-Id: I4f9e9eb6205bd1f638de95696b63e0fb9ec42e83
Auto-generated-cl: translation import
 2013-07-08 09:22:36 -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 Automerger
f71e502149 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-08 05:55:42 -07:00
The Android Open Source Project
f98ac485e3 am d8e00a0b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'd8e00a0ba3993fde61a06623d901bf13705c353d':
 2013-07-03 14:36:40 -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
6311d74296 am 143d4600: (-s ours) am 8bd9f2f2: am 76185f72: Import translations. DO NOT MERGE 
* commit '143d4600276b43457ae12eaaa9c585ca2650a908':
  Import translations. DO NOT MERGE
 2013-07-03 14:30:01 -07:00
Baligh Uddin
26c165d8e4 am 7f49b198: (-s ours) am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '7f49b198d0f7477cf6a64e704260373b65ba71f4':
  Import translations. DO NOT MERGE
 2013-07-03 14:30:00 -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
a0387518c9 am 8db7a8c5: (-s ours) am ad965c17: Import translations. DO NOT MERGE 
* commit '8db7a8c58e6732f0a7341657ff162ff49d031ebd':
  Import translations. DO NOT MERGE
 2013-07-03 14:22:20 -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
a5c0091071 Import translations. DO NOT MERGE 
Change-Id: If98562e409c4046b37b8b1a92b171e222403233f
Auto-generated-cl: translation import
 2013-07-03 13:59:41 -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
19e598acf0 am daa0e5ab: (-s ours) am e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'daa0e5ab7acca1d96278c416ce0060524507af01':
  Import translations. DO NOT MERGE
 2013-07-02 12:41:23 -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
786cdbd36f Merge "Import translations. DO NOT MERGE" 2013-07-02 16:35:06 +00: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
41f3c55226 am 17f1fa42: am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings. 
* commit '17f1fa4207e45276a11e52bbc65dc26a25911006':
  Add Manage mobile plan to Settings.
 2013-07-01 17:01:28 -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
30dd3dc34f Import translations. DO NOT MERGE 
Change-Id: I9fab5b88800615e150968d8b664b1553b808f399
Auto-generated-cl: translation import
 2013-07-01 09:24:12 -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
c40e5ffff9 am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '6ab277ee50d91bb6b50cacda55e84ac3afc4323b':
 2013-07-01 07:47:44 -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
Amith Yamasani
902d1bc484 Merge "Don't start the loader task if one is already running" 2013-06-28 22:35:54 +00:00
Amith Yamasani
ab72687b15 Don't start the loader task if one is already running 
This should appease the monkeys.

Bug: 9619255
Change-Id: Idbac0bd86acafbdb636b0b18e09fcbb9eea15cc4
 2013-06-28 15:30:08 -07:00
Robert Greenwalt
7a2466b511 am 50702355: am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit '50702355f23d5e270727018c2af7cc76a1bd91eb':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 10:48:40 -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
74a14ed364 am 29bed78d: am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit '29bed78df624789d951eb6f491742bd29d7859ff':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 15:02:35 -07: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