Build V1.3
Settings: add quick pulldown listpreference
as well respect rtl layout changes
Revert "Darkness prevails"

This reverts commit a7ce1b23a8ff4714312bce684d3193b1759543d2.
Revert "Darkness fixes"

This reverts commit 9f8592ea1a70bcd98438ae8c14aa3591aa13156b.
Revert "Material > Material.Light"

This reverts commit be56bd5de9634c13d179ec903b01981ee971b55f.
Correct double tap to sleep summary

Change-Id: If2e7ab2c138e72eeb7d862738bb7dd3ad43d4b16
Correct development shortcut summary

Change-Id: Ia776d25c8f58789c3eedf16b7d5c705b04130b5f
Improve notification tone string

Change-Id: I731903a7bcda38229502de33dbc83c44e3782996

Conflicts:

	res/values/cm_strings.xml
Protected Apps: update protected apps screens UI

Change-Id: I2dd922956f8ffd9ed153c3d1aa1f9161a127e4c6
Remove unnecessary drawables for launching Protected Apps

Change-Id: I58f471ef9d64c7ced79befbfc30b94d75a0085a2
Move Blacklist and Notif Filter to Privacy

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
Settings: Update AppNotificationSettings if user resumes

Right now if a user resumes this activty (eg from recents) and did change in the
mean time settings which effects the visibility of preferences in AppNotificationSettings
(eg were removed) it does not get updated.

Fix it with simply reloading the content on onResume and decide to show the entries
on the current user settings situation.

Change-Id: I0b16ebf35604fdca1611f026c9b609427f3060c8
Wake up settings housekeeping
[1/2] Settings AppOps: show/hide app type and allow/deny counters

Squash of:

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Thu Oct 3 13:51:31 2013 -0700
AppOps: menu options to show/hide user and system apps
Change-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6

Author: Sam Mortimer <sam@mortimer.me.uk>
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Oct 2 22:24:14 2013 -0700
[1/2] AppOps: Show allowed/ignored counts
Change-Id: Ia27737155c33e934df9a2a1fcff88379240fd096

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sun Dec 1 21:39:07 2013 -0800
AppOps: only apply app type filters to summary screen
    *) If buildState() is called for a single package, do
       not apply hide user/system app filters.
    *) Fixes show detail display when called via
       long press in privacyguard and an AppOp hide
       filter is ticked.
Change-Id: If31d094fb989836ab6829daeefe820695032c0ed

Change-Id: I4d6f37b3923eb9bc98d67101d6f0ef481a427682

Patchset: 2
http://review.cyanogenmod.org/#/c/79397/
[1/2] Settings: Add support for OP_ALARM_WAKEUP

Port from cm-10.2 and cm-11.0

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Mon Sep 30 23:10:35 2013 -0700
[1/2] AppOps: Add alarm wakeup op
Change-Id: Ic739519cb9df9d2c67d65e3572a119b4d55145f0

Change-Id: I417742d00f60b487942ee2adf9b75d2b04a0f766

Patchset: 1
http://review.cyanogenmod.org/#/c/80212/
Status bar housekeeping
Partition info make more sense

(cherry picked from commit fe5853bd3ff8da01177a88dacee2051c18d5a6ff)

Conflicts:
	res/xml/device_info_memory.xml
Build V1.4
Remove volume rocker wake for now