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

Merge commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8'

* commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8':
  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