Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Bluetooth into cm-10.1
Merge branch 'cm-10.1' of github.com:temasek/android_packages_apps_Bluetooth into cm-10.1