commit skip

Change-Id: I131f0baa223f1cf55ab6a644626ee46833464e94
Merge branch 'kitkat' of https://github.com/buffer-dev/packages_apps_Settings into kitkat