minor translation

Change-Id: I9eb18b4d955f4227911ecaf345d68cd1d6ed3b1d
reorganization

Change-Id: I9f371e14eee946f90e3f0c7f57f08f22ca5dfff0
fix

Change-Id: I01cf0cc0d0ea9534cff57abd8492a4ae9d5aedf0
fix2

Change-Id: I8eb366356f117d73721af05d3839aa5736d14372
Merge branch 'kk4.4-nelo' of https://github.com/nelo360/packages_apps_Settings into kk4.4-nelo