Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp * commit '485e6dca960c2001349de0817c644f24ae85c6e3': Add Bluetooth Device trust
Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp * commit '485e6dca960c2001349de0817c644f24ae85c6e3': Add Bluetooth Device trust