Fix HighTouchSensivity (1/2)

Change-Id: I3d3207fefef496ba787055b1598c60b327ab9bb6
Revert "Fix HighTouchSensivity (1/2)"

This reverts commit 770b22de62eae0a4c269418986a8420e3535bbf0.

Change-Id: I0d243d512220f265f462a98c0dc15372b314e714
Settings: Fix AOSP ES translations

Change-Id: Ie596596891ad3ceacb846f7f059a64c09bb14c68
Settings: Modify and add AOSP JA translations

Change-Id: I36fd1817aa9be4c4ccb6054964b65cc2696c188f
Revert "Revert "Fix HighTouchSensivity (1/2)""

This reverts commit 8795728f12e2ef2347047f1b4e08358bca3452ab.

Change-Id: Ia4a06385b8e209f72bb1e9960f7319b5a4496c14
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into DJL11