Merge branch 'linaro_android_4.3' of git://android.git.linaro.org/platform/packages/apps/Settings into linaro_android_4.3