[3/3] Settings: Built-in superuser

PS2: Fixed formatting issues

Change-Id: Ia38f5a7737b7aff1d4d8291285dd1a17a5e63c1e
Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into legacy

PS2: Didn't merge Local_aapt_flags: Fix aapt local set
     * This allows to display Settings in other language other than default *

Signed-off-by: houst0nn <houstonn@gmail.com>

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags
	src/com/android/settings/Settings.java

Change-Id: I8c7d41fa9efae7d2ddee9de09c264058dbc18687
Settings: EL AOSP translation fixes

Come on AOSP, we're fixing these since ICS...

Change-Id: Ic94f25a2335d187c98d8712e8dbd3bcaac82cfb9
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_packages_apps_Settings into kk4.4