angrydino/android_packages_apps_Settings — pull request #2 by Dshoe (2013-08-01 23:24:20+00:00)
Title: Settings: Generic Blacklist support (1 of 5)

Change-Id: I58aff50637b9bf71095ec791e16efd520e6c29a3

Conflicts:
AndroidManifest.xml
res/values/cm_arrays.xml
res/values/cm_strings.xml
src/com/android/settings/SecuritySettings.java
src/com/android/settings/Settings.java