Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_packages_apps_Settings into jb-mr1
Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_packages_apps_Settings into jb-mr1
Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_packages_apps_Settings into jb-mr1
Settings: EL translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I12dae3dede954b6c73dcba6c6f7a40239e12f6d3
Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_packages_apps_Settings into jb-mr1
Settings : Update branch "jb-mr1" into kylin
Merge branch 'cm-10.1' into martincz
Merge branch 'cm-10.1' into kylin
Fix changelog settings error key
Merge remote-tracking branch 'origin/jb-mr1' into jb-mr1-test