Allow other users to modify button settings

Change-Id: Id3b16f3fa3f1e7a8eaef42cfdc12e93dff3fed9b
Settings: CA translations

Change-Id: I3b1456353b1e0fa6951d6e1f59b177ec0d6ab936
Merge "Allow other users to modify button settings" into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge "Settings: CA translations" into cm-10.2
Lock Screen - Option to hide initial page hints (2/2)

Change-Id: I6185a6a19b75da5f8d87ef4d9ca6b1d8b3fdbb67
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'Upstream/cm-10.2'