Merge remote-tracking branch 'cm/jellybean' into jellybean-aml
Settings: Update Greek translations

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

Change-Id: I00f62bcb1fd58c9a4aefaea7daa970b6d9dc6742
Settings: Update Greek translation

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

Change-Id: I5f23cc8100fdca1f6553d78ff4e2da1fdeee294d
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Settings into jellybean-aml
Merge branch 'jellybean-aml' of https://github.com/christiantroy/android_packages_apps_Settings into jellybean-aml