am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair
am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair

Merge commit '4e552b606cc9fc3e6cac210b3894974709531ec1' into eclair-mr2-plus-aosp

* commit '4e552b606cc9fc3e6cac210b3894974709531ec1':
  Add BMW and Audi to Auto Pairing black list.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base