Add Build version, advanced reboot and developer options enabled by default, (2/2)

Change-Id: Icde54c763a23648060c5ecfc046ff8e68ba5b34c
Re-add lockscreen music controls setting.

Change-Id: If137978d5c0fa197e75707fd6fe7b09c850de454
CellBroadcast: Disable App links on wifi-only devices

PatchSet 2: Remove unnecessary check

Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2
Reorganize "About phone":

Included:
- Categories
- Dark Jelly Updates
- Dark Jelly Changelog
- Reorganize preferences

Change-Id: I48d0558dc3ed7fdf1fd3885440d2c13e1557e1ac
Fix app selection when adding apps to app groups.

- Don't drop separate apps with the same title
- Sort case-insensitive
- Sort disabled apps to the end of the list

Change-Id: Iffadca4896468aaee5fcfd60f8776c2bb1a8ce7f
Reenable split action bar for profile settings.

Change-Id: I5af3f0fd7cafaab6f2d9152df943658170fc58ce
Sort disabled apps to the end of the list in privacy guard manager.

JIRA: CYAN-1707
Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
Merge "Re-add lockscreen music controls setting." into cm-10.2
Merge "Reenable split action bar for profile settings." into cm-10.2
Merge "Fix app selection when adding apps to app groups." into cm-10.2
Merge "Sort disabled apps to the end of the list in privacy guard manager." into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2
Remove CMStats and Google Analystics support

Change-Id: I380b112b9365de4055d88bf68a4f3d4ac4c63abc
Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Settings: Tweak strings for notification drawer auto close

Change-Id: I5aa8c8a6876aad59cf578d31edfa8a099d2dbd97
Remove SuperUser preference, if SuperSu is installed

Change-Id: I587f3ae7528213a43149dddac720b4cce226395d
Settings: Use US spelling of behaviour

Change-Id: I75d2f4d35e29fe9cd4da3852f2579804910a6dfc
Settings: Align Notification drawer behavior layout w design guidelines

A category is not needed for a single item - use the item title to
indicate it instead

Change-Id: Iffc78b3fd20fd29832b8f9baae322c79e4af8c87
Settings: Add an option to enable Dual pane mode

Change-Id: I910906696bf60f0eb0de69733b80aaa245dd301d