ParanoidAndroid/android_packages_apps_Settings — pull request #12 by slickrick (2013-06-06 10:59:04+00:00)
Title: Port "Option to hide Adb notification icon (1/2)"

Change-Id: Ic58b1727adc223a9ec0de48fa44df442937797cb

Conflicts:
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java