Merge remote-tracking branch 'upstream/kk-4.4' into kk-4.4
Merge branch 'kk-4.4' of git://github.com/beegee-tokyo/platform_packages_apps_settings into kk-4.4