Merge "system activity for scan always available setting" into jb-mr2-dev
Application restrictions UI

Refactored User Settings UI to have two types of users.
Display a list of apps to select.
Edit user restrictions.
Handle saving and updating RestrictionEntry items via
User Manager.

Change-Id: I3ad5aa71d5ef66dffd39e17ba0556f075ac10a0f
Merge "Application restrictions UI" into jb-mr2-dev
Settings: Update Korean translation

Change-Id: I36fd2eecb9d24d78d5e8406333ab2e88cf17ac13
Merge "Settings: Danish latest merges" into cm-10.1
Merge "Keep up with INotificationListener changes." into jb-mr2-dev
Merge "Optimizations in the notification list:" into jb-mr2-dev
Merge "Add some extra info to the notification list rows." into jb-mr2-dev
Settings: Minor Polish translation update

Change-Id: I8b8defa5e4eca79d725f38f46559d5bb03b2d3e3
Notify user that scans are still active

Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
Merge "Notify user that scans are still active" into jb-mr2-dev
Do not display volume settings if volume is fixed

When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.

Bug 8161458

Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def
Fix build

Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c
Merge "Settings: Minor Polish translation update" into cm-10.1
Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
Merge "Settings: Simplified Chinese Translations" into cm-10.1
Import translations. DO NOT MERGE

Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import
Settings: Update italian translation

	Add volume tile translation in quicksettings
	Extract cyanogenmod strings in cm_strings.xml and cm_arrays.xml

	Patchset 2: Fix unwanted charsequence
	Patchset 3: Fix license header
	Patchset 4: Remove double quotes
	            Fix xml attributes
	            Fix license headers
	Patchset 5: Add 'no translation found' comments in strings.xml and arrays.xml
	            Re-add previously removed line 169 "date_and_time" (msgid="4114084177056654663")
                    as in original AOSP file. The only differences still in place between this file
                    and the AOSP one are 5 corrections at lines 29,30,1314,1562 and 1732
	Patchset 6: Fix nothing. This patchset is the nth attempt to make that crappy cid work.

Change-Id: Ibc0fde970a25f46d0612c7b1c41525310731a968
Merge "Settings: Update italian translation" into cm-10.1
Settings: Fix PL translations

Change-Id: I96cc937847be2f2e4dbe985416150cee322d0d3f