Privacy Guard IN, App Ops OUT

Change-Id: I4edd13a2d24ac1a981bfab0683a49f93245aa099
Merge "Privacy Guard IN, App Ops OUT" into kitkat
Merge "MIUI Style carrier text in the statusbar [2/2]" into kitkat
Disable settings search on all subactivities.

This leaves the search in place in multi-pane configurations, and keeps
it only in the main settings screen for single-pane configurations.

Change-Id: I2db74193d534b66e1faf20293996c611621dfe58
MIUI Style carrier text in the statusbar [2/2]

AICPfy

Change-Id: Ic053615e86401972a15053142191d561fd82e89b
don't disable lockscreen widgets on low memory devices (2/2)

Change-Id: Ieb2176754b1b7892d16f232707b2dc173e12e23f
Merge "don't disable lockscreen widgets on low memory devices (2/2)" into kitkat
Integrate stats into settings

Change-Id: I145af631303face609bac691f56832dc498a2ca9
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	res/xml/device_info_settings.xml
Merge ap
Revert "Integrate stats into settings"

This reverts commit 0aaa60bb18debf41b0435da01ad3852f67f3dbc7.

Conflicts:
	res/xml/device_info_settings.xml
Revert
Integrate stats into settings

Change-Id: I145af631303face609bac691f56832dc498a2ca9

Conflicts:
	res/xml/device_info_settings.xml
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	res/xml/aicp_carrier_label_prefs.xml
	src/com/android/settings/aicp/CarrierLabel.java
Merge Fixes