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
tree: 425f5c3e143fea8aca48ef51b89089eba7040cb5
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE