tree e498875a6307101176e6aafa7b0167e67a735b22
parent 7d8ef2517c31db2c89ec7198f4a248eabf6d6943
parent 8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91
author Michael Chan <mchan@android.com> 1257543173 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257543173 -0800

am 8d51f710: Merge change Icdd2864e into eclair

Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-plus-aosp

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth