OSDN Git Service
Amith Yamasani [Wed, 28 Sep 2011 01:13:25 +0000 (18:13 -0700)]
Merge "Show in Settings->About if the device is an engineering sample."
Amith Yamasani [Tue, 27 Sep 2011 23:02:25 +0000 (16:02 -0700)]
Show in Settings->About if the device is an engineering sample.
Don't show anything additional for a production device.
Bug:
5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
Mike Sipe [Wed, 28 Sep 2011 00:01:12 +0000 (17:01 -0700)]
Merge "Fix
5287113: rename "FaceLock" to "Face Unlock" in Settings"
Jim Miller [Tue, 27 Sep 2011 23:35:46 +0000 (16:35 -0700)]
Fix
5287113: rename "FaceLock" to "Face Unlock" in Settings
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
Jeff Sharkey [Tue, 27 Sep 2011 23:27:56 +0000 (16:27 -0700)]
am
76ac6a9b: Merge "About." into ics-factoryrom
* commit '
76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
About.
Jeff Sharkey [Tue, 27 Sep 2011 23:26:08 +0000 (16:26 -0700)]
Merge "About." into ics-factoryrom
Jeff Sharkey [Tue, 27 Sep 2011 22:12:51 +0000 (15:12 -0700)]
About.
Bug:
5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
Eric Fischer [Tue, 27 Sep 2011 22:01:01 +0000 (15:01 -0700)]
am
22aca59e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
22aca59e80d2376b89262b598a486bdd3272d969':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 27 Sep 2011 21:57:23 +0000 (14:57 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Eric Fischer [Tue, 27 Sep 2011 21:33:22 +0000 (14:33 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib4fe1d2dd91618933614f68f6224c8ac48d31bc8
Amith Yamasani [Tue, 27 Sep 2011 20:10:47 +0000 (13:10 -0700)]
am
ae69755a: Disable USB connection type when monkeys are running.
* commit '
ae69755aa874dbac77e9874d9716ab891a144193':
Disable USB connection type when monkeys are running.
Amith Yamasani [Tue, 27 Sep 2011 18:33:17 +0000 (11:33 -0700)]
Disable USB connection type when monkeys are running.
Bug:
5375336
Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())
Bug:
5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
Svetoslav Ganov [Tue, 27 Sep 2011 18:22:06 +0000 (11:22 -0700)]
Merge "Clarify install accessibility scripts wording."
Svetoslav Ganov [Tue, 27 Sep 2011 18:12:58 +0000 (11:12 -0700)]
Clarify install accessibility scripts wording.
1. Updated the wording according to tech writer feedback to be
more precise and avoid user confusion.
bug:
5374051
Change-Id: Ica54b91f475be1d271f1588f044a5a2b72a44e51
The Android Open Source Project [Tue, 27 Sep 2011 17:11:04 +0000 (10:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I412a835f2e84fb56191c0378cf5dc908935f7b8a
Danielle Millett [Tue, 27 Sep 2011 13:14:01 +0000 (06:14 -0700)]
Merge "Changed header to specify backup lock"
satok [Tue, 27 Sep 2011 08:52:00 +0000 (01:52 -0700)]
Merge "Fix the alignment of the preference in IME settings on Tablet"
satok [Tue, 27 Sep 2011 08:45:08 +0000 (17:45 +0900)]
Fix the alignment of the preference in IME settings on Tablet
Bug:
5366586
Change-Id: I2659415fb74cca2c65bdd3171217e786d4f41aac
satok [Tue, 27 Sep 2011 07:10:57 +0000 (00:10 -0700)]
Merge "Tweak IME settings"
satok [Tue, 27 Sep 2011 06:46:42 +0000 (15:46 +0900)]
Tweak IME settings
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
Eric Fischer [Tue, 27 Sep 2011 02:44:31 +0000 (19:44 -0700)]
am
0e5fd21b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0e5fd21beb33a39b4254d4c8dd6b60c0939dbee0':
Import revised translations. DO NOT MERGE
The Android Automerger [Mon, 26 Sep 2011 23:17:56 +0000 (16:17 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jeff Sharkey [Mon, 26 Sep 2011 22:31:57 +0000 (15:31 -0700)]
Merge "Data usage strings, sweep touches, fixes."
Danielle Millett [Mon, 19 Sep 2011 23:16:29 +0000 (19:16 -0400)]
Changed header to specify backup lock
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock
Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
Eric Fischer [Mon, 26 Sep 2011 21:51:07 +0000 (14:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I287527c2b071e0babd191b47fc1b80c160232d74
Kenny Root [Mon, 26 Sep 2011 21:38:10 +0000 (14:38 -0700)]
Merge "Make verifier device id information visible"
The Android Open Source Project [Mon, 26 Sep 2011 19:11:47 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic66f78817e5ae10c997cf34a35e0d8b3abade1ba
Amith Yamasani [Mon, 26 Sep 2011 18:51:39 +0000 (11:51 -0700)]
Merge "Fixes to parent fragment names and other manifest issues."
Kenny Root [Sun, 25 Sep 2011 16:23:27 +0000 (09:23 -0700)]
Make verifier device id information visible
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.
Bug:
5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
Jeff Sharkey [Mon, 26 Sep 2011 01:22:48 +0000 (18:22 -0700)]
Data usage strings, sweep touches, fixes.
Change strings around limiting background data. Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.
Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.
Bug:
5341374,
5337650,
5337385,
5319465,
5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
The Android Automerger [Mon, 26 Sep 2011 01:16:31 +0000 (18:16 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Wink Saville [Sun, 25 Sep 2011 22:25:39 +0000 (15:25 -0700)]
am
426fc66a: Add persist.radio.ramdump.
* commit '
426fc66a8a9371e34d936d18d5b254fd002b4c11':
Add persist.radio.ramdump.
Amith Yamasani [Fri, 2 Sep 2011 16:47:18 +0000 (09:47 -0700)]
Fixes to parent fragment names and other manifest issues.
Bug:
5324865
Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.
Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
Wink Saville [Sun, 25 Sep 2011 21:39:02 +0000 (14:39 -0700)]
Add persist.radio.ramdump.
A little refactoring to keep most everything for these "temporary"
flags in one place.
Bug:
5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
The Android Automerger [Sun, 25 Sep 2011 13:30:06 +0000 (06:30 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Svetoslav Ganov [Fri, 23 Sep 2011 23:57:32 +0000 (16:57 -0700)]
Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off."
Svetoslav Ganov [Fri, 23 Sep 2011 23:47:31 +0000 (16:47 -0700)]
Settings may show enabled accessiiblity services after restore even if accessibility is off.
Now the state of accessibility is determined from the number of running, i.e. enabled and
installed, accessibility services - more than zero access is on else it is off. After a
restore the device may have some enabled and installed services but disabled accessibility
setting. In such case settings should respect the restored values and the services should
be displayed as disabled initially and then enabling one of them will enable accessibility.
bug:
5367404
Change-Id: If3756aba3f59e282000247e99f87ebff2b64c9fd
Eric Fischer [Fri, 23 Sep 2011 22:44:39 +0000 (15:44 -0700)]
am
86b49eea: (-s ours) Import revised translations. DO NOT MERGE
* commit '
86b49eea5e7735f72ed72069439cc74dbcc9a878':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:28:41 +0000 (15:28 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
The Android Automerger [Fri, 23 Sep 2011 18:36:19 +0000 (11:36 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Wink Saville [Fri, 23 Sep 2011 06:39:35 +0000 (23:39 -0700)]
am
fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit '
fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
Add a button to enable/disable Mobile Terminated SMS over IMS
Amith Yamasani [Fri, 23 Sep 2011 00:04:12 +0000 (17:04 -0700)]
Merge "Don't append list of accounts every time we return to this screen."
Wink Saville [Thu, 22 Sep 2011 22:29:19 +0000 (15:29 -0700)]
Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
Wink Saville [Thu, 22 Sep 2011 22:17:00 +0000 (15:17 -0700)]
Add a button to enable/disable Mobile Terminated SMS over IMS
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.
Change-Id: I4581bca76899445e825260e8af6a39903d029c44
Amith Yamasani [Thu, 22 Sep 2011 21:34:17 +0000 (14:34 -0700)]
Don't append list of accounts every time we return to this screen.
Bug:
5355920
Remove the contents of the layout before adding the accounts.
Change-Id: Ic9256140f892968b2388f47d982eaada720df892
The Android Open Source Project [Thu, 22 Sep 2011 17:57:43 +0000 (10:57 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I5c6e500d5a097aa638399321001fec81493cc0c4
Jeff Hamilton [Thu, 22 Sep 2011 17:48:20 +0000 (10:48 -0700)]
am
0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
* commit '
0d299625ebadae3d8b0881979633680e16b07daa':
Bring back the Android Beam settings panel.
Jeff Hamilton [Thu, 22 Sep 2011 17:47:03 +0000 (10:47 -0700)]
Merge "Bring back the Android Beam settings panel." into ics-factoryrom
Jeff Hamilton [Thu, 22 Sep 2011 17:41:34 +0000 (10:41 -0700)]
am
4a2aabc4: Merge "Add strings for translation." into ics-factoryrom
* commit '
4a2aabc4d739ded949daa721adfce55fed2be2b6':
Add strings for translation.
Jeff Hamilton [Thu, 22 Sep 2011 17:40:23 +0000 (10:40 -0700)]
Merge "Add strings for translation." into ics-factoryrom
Jeff Hamilton [Wed, 21 Sep 2011 21:44:36 +0000 (16:44 -0500)]
Bring back the Android Beam settings panel.
Bug:
5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
Jeff Hamilton [Thu, 22 Sep 2011 17:35:40 +0000 (12:35 -0500)]
Add strings for translation.
Ben Komalo [Thu, 22 Sep 2011 17:02:22 +0000 (10:02 -0700)]
am
9ee164f4: Properly initialize wakelock for cryptkeeper.
* commit '
9ee164f44ea1ad66fa16ed702eb885e36ade0d8b':
Properly initialize wakelock for cryptkeeper.
Ben Komalo [Wed, 21 Sep 2011 17:40:50 +0000 (10:40 -0700)]
Properly initialize wakelock for cryptkeeper.
Bug:
3385856
Change-Id: I6dc39b02b81e290af0b47f6a6c9ba2da3e7c65c3
The Android Automerger [Wed, 21 Sep 2011 13:30:24 +0000 (06:30 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:34 +0000 (06:19 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: If2f6db678efa1560ab1fa3349be18a03d69624f5
The Android Automerger [Wed, 21 Sep 2011 03:43:07 +0000 (20:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Svetoslav Ganov [Wed, 21 Sep 2011 01:04:06 +0000 (18:04 -0700)]
am
89cd48cd: Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom
* commit '
89cd48cd8e01081f470ea299dbf841a0099226ae':
Accessibility settings get into state not allowing to enable accessibility.
Svetoslav Ganov [Wed, 21 Sep 2011 01:02:20 +0000 (18:02 -0700)]
Merge "Accessibility settings get into state not allowing to enable accessibility." into ics-factoryrom
Amith Yamasani [Tue, 20 Sep 2011 23:58:52 +0000 (16:58 -0700)]
am
bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
* commit '
bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
Move "Pulse notification light" to Display settings.
Amith Yamasani [Tue, 20 Sep 2011 23:57:32 +0000 (16:57 -0700)]
Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
Eric Fischer [Tue, 20 Sep 2011 22:38:38 +0000 (15:38 -0700)]
am
f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
f85b8b1a17d9c91d5fff5a55c1546544e682c4b1':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:37:04 +0000 (15:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Freeman Ng [Tue, 20 Sep 2011 22:36:33 +0000 (15:36 -0700)]
am
01b20096: Merge "adjust char limit for translations" into ics-factoryrom
* commit '
01b2009608a1ce58711efac4541f4acad62e038c':
adjust char limit for translations
Freeman Ng [Tue, 20 Sep 2011 22:34:30 +0000 (15:34 -0700)]
Merge "adjust char limit for translations" into ics-factoryrom
Eric Fischer [Tue, 20 Sep 2011 22:24:00 +0000 (15:24 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
Freeman Ng [Tue, 20 Sep 2011 22:18:05 +0000 (15:18 -0700)]
adjust char limit for translations
bug:
5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
Amith Yamasani [Tue, 20 Sep 2011 22:13:35 +0000 (15:13 -0700)]
Merge "Allow shortcuts to Tethering and Data usage screens."
Amith Yamasani [Tue, 20 Sep 2011 21:41:03 +0000 (14:41 -0700)]
Move "Pulse notification light" to Display settings.
Bug:
5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
Svetoslav Ganov [Tue, 20 Sep 2011 18:10:44 +0000 (11:10 -0700)]
Accessibility settings get into state not allowing to enable accessibility.
If the setting for enabled accessibility serivces contains a service that
is not installed on the device the system gets into a state that does not
allow enabling accessibility. This state is not recoverable.
bug:
5343351
Change-Id: I6127ae00f7a16b190cfe43b68b8e71d49b10911e
Eric Fischer [Tue, 20 Sep 2011 18:02:16 +0000 (11:02 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 20 Sep 2011 17:37:57 +0000 (10:37 -0700)]
Import revised translations.
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
Luca Zanolin [Tue, 20 Sep 2011 17:03:42 +0000 (10:03 -0700)]
Merge "Change title in the setting for "Speech" category"
Luca Zanolin [Tue, 20 Sep 2011 16:58:45 +0000 (17:58 +0100)]
Change title in the setting for "Speech" category
Bug:
5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
The Android Open Source Project [Tue, 20 Sep 2011 14:43:27 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Id11b3b3373d00ebc6afce94f21ca1b6edfcfca42
The Android Automerger [Tue, 20 Sep 2011 13:28:47 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ben Komalo [Mon, 19 Sep 2011 23:55:51 +0000 (16:55 -0700)]
am
69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom
* commit '
69dfd42520ccea4556a860b483e264a229293fa2':
Mark Settings as a "core" app.
Ben Komalo [Mon, 19 Sep 2011 23:52:32 +0000 (16:52 -0700)]
Merge "Mark Settings as a "core" app." into ics-factoryrom
Wink Saville [Mon, 19 Sep 2011 21:24:39 +0000 (14:24 -0700)]
Add Button to *#*#INFO#*#* for ims registration.
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired
Bug:
5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
Wink Saville [Mon, 19 Sep 2011 22:02:02 +0000 (15:02 -0700)]
am
1e596f30: Add Button to *#*#INFO#*#* for ims registration.
* commit '
1e596f303520d211aebc87dfc0c08108efe80921':
Add Button to *#*#INFO#*#* for ims registration.
Ben Komalo [Mon, 19 Sep 2011 21:27:13 +0000 (14:27 -0700)]
Mark Settings as a "core" app.
This ensures settings is still loaded when the framework loads in a
minified state (e.g. while encrypting the device).
Bug:
5031399
Change-Id: I8c1c7331eb34c192abb18b9a77426f2e028baccb
Wink Saville [Mon, 19 Sep 2011 21:24:39 +0000 (14:24 -0700)]
Add Button to *#*#INFO#*#* for ims registration.
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired
Bug:
5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
Amith Yamasani [Mon, 19 Sep 2011 20:25:52 +0000 (13:25 -0700)]
Allow shortcuts to Tethering and Data usage screens.
Bug:
5290301
Change-Id: Id271fd33a54adb38ce3312d4a03fd6f4a05394e8
Jeff Sharkey [Sun, 18 Sep 2011 23:17:37 +0000 (16:17 -0700)]
am
2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom
* commit '
2ae885210ef04d2533a2fc121a7f2b8770efa7e4':
Surface tethering stats in data usage.
Jeff Sharkey [Sun, 18 Sep 2011 23:15:53 +0000 (16:15 -0700)]
Merge "Surface tethering stats in data usage." into ics-factoryrom
Mike Lockwood [Sun, 18 Sep 2011 21:52:54 +0000 (17:52 -0400)]
Fix race condition in MTP/PTP checkbox updating
UsbManager.getDefaultFunction() might not return the updated state immediately
after changing the USB configuration, so do not rely on it for updating
after a checkbox has been clicked.
Change-Id: I5ae8d46854f24403cda2c62e006c742dcd257d1d
Bug:
5334777
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Sharkey [Fri, 16 Sep 2011 08:52:39 +0000 (01:52 -0700)]
Surface tethering stats in data usage.
Bug:
5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
Danielle Millett [Sat, 17 Sep 2011 00:48:35 +0000 (17:48 -0700)]
Merge "Adding info explaining facelock's backup lock"
Eric Fischer [Fri, 16 Sep 2011 23:27:30 +0000 (16:27 -0700)]
am
f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
f4d6c876218124364e0e044426cc86058b20d935':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 23:25:25 +0000 (16:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Irfan Sheriff [Fri, 16 Sep 2011 23:06:53 +0000 (16:06 -0700)]
Merge "Update p2p settings UI"
Eric Fischer [Fri, 16 Sep 2011 22:37:26 +0000 (15:37 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ie7541f00b4b272d6ca840cde6286bcd5d6584ae4
Dianne Hackborn [Fri, 16 Sep 2011 20:52:39 +0000 (13:52 -0700)]
Merge "Fix issue #
5320747: Disabling an app that is an active device administrator..."
Dianne Hackborn [Fri, 16 Sep 2011 20:36:20 +0000 (13:36 -0700)]
Fix issue #
5320747: Disabling an app that is an active device administrator...
...can lead to an unsecure device
Now you can't disable device admins.
Or clear their data.
Or force stop them.
Or uninstall them (though the package manager also prevents uninstalling, might
as well disable this button along with everything else).
Change-Id: I69eefc2342e6f932908e9f5b87d3a601752810a4
Danielle Millett [Fri, 16 Sep 2011 19:41:30 +0000 (15:41 -0400)]
Adding info explaining facelock's backup lock
This changes the security picker when selecting a backup lock for facelock
such that it says back up lock and gives a brief description of why it's needed.
This is currently a temporary way to display the info and will need to be changed
for the final release.
Change-Id: I6373f97caec088482d36c65bd210c79238c623cf
Justin Ho [Fri, 16 Sep 2011 18:18:09 +0000 (11:18 -0700)]
am
a9efa2c2: Merge "Updated Settings Launcher icon Bug:
5286988" into ics-factoryrom
* commit '
a9efa2c2eafcd02a15138fc768b0492698e915fa':
Updated Settings Launcher icon Bug:
5286988
Justin Ho [Fri, 16 Sep 2011 18:16:41 +0000 (11:16 -0700)]
Merge "Updated Settings Launcher icon Bug:
5286988" into ics-factoryrom
Irfan Sheriff [Sat, 10 Sep 2011 00:06:05 +0000 (17:06 -0700)]
Update p2p settings UI
- Add self device information on settings
- Add remove group option
Bug:
5332330
Change-Id: I5de4fa1e92a5182e10269fe5c2b78f1f6313fb63
Justin Ho [Fri, 16 Sep 2011 15:52:17 +0000 (08:52 -0700)]
Updated Settings Launcher icon
Bug:
5286988
Change-Id: I9e1a2cf0c00d8f82451aea2edc7d47e8ce49aaf9
Irfan Sheriff [Fri, 16 Sep 2011 02:49:17 +0000 (19:49 -0700)]
Merge "Fix settings handling of wifi events"