CarbonDev/android_packages_apps_Settings — pull request #49 by Dshoe (2013-06-18 22:29:14+00:00)
Title: Add ChangeLog to Settings

Credit: CyanogenMod

Change-Id: I0edd312ce30a566c426a3a3656267e6ff6d2bbc6

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