merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
Update Settings app to use new namespace for airplane-mode settings

Bug 7132230

Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
merge in jb-mr1-release history after reset to jb-mr1-dev
Wifi settings are in a different namespace now

Bug 7144874

Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
Fix crash in Settings > Security

Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
Must initialize the new atomic..

bug:7172859
Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462
merge in jb-mr1-release history after reset to jb-mr1-dev
Fix issue #7178865: Selecting an app from Settings > Apps>...

...all crashes on a secondary user

Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
merge in jb-mr1-release history after reset to jb-mr1-dev
Fix a crash in InstalledAppDetails

Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
Fix NPE in DeviceInfoSettings

Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74