summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-11-06 13:32:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-06 13:32:42 -0800
commit830ab02954738cda68d39973dfcb2a054b32e05c (patch)
treebc39f20c2d64c45a2d9ea420e2f5a0469e225b11 /res
parent6e787689bec2d53a057e9e7f6b5a20ce22a8adeb (diff)
parent834e5993e4f2f34d5aceb3196601b30231d00b07 (diff)
downloadpackages_apps_Settings-830ab02954738cda68d39973dfcb2a054b32e05c.zip
packages_apps_Settings-830ab02954738cda68d39973dfcb2a054b32e05c.tar.gz
packages_apps_Settings-830ab02954738cda68d39973dfcb2a054b32e05c.tar.bz2
am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp * commit '834e5993e4f2f34d5aceb3196601b30231d00b07': b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions