tree 9f786105cebfa8b62f65bc5732accfb28eeac09f
parent 36704bb8ffd433450994c0260c411bfa9424326d
parent 811f655366461d0f21f970bcac07dd2084fd54fa
author Michael Chan <mchan@android.com> 1257543722 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257543722 -0800

am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair

Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp

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