Bury those beans

Change-Id: Id012dc441ff0bdce27f4778118990619a91e88d5
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat