Merge commit: fda1c0e1793e79a64269eb83a0b2fd3fe4e8c744
Merge branch 'kitkat' of github.com:BAM-Team/android_packages_apps_BAMControl into kitkat