com.android.settings
Conflicts:
	src/com/android/settings/crom/RibbonTargets.java
RC: Ribbons Colorize Action Icons

Change-Id: Iaa8cf10a04e37fb26a073f71d059922b24afa0f6
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Settings: Add Permissions Management to AOKP [1/4]

So that user can easily access the Permissions Management app via settings.

Change-Id: I4f30389c3f8c9f05c0279c60ed819a65aa0d69df
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml

Conflicts:
	res/values/strings.xml