Merge change Icdd2864e into eclair

* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
tree: f86255f2a58669ee9924e8dba8e0ecdc4745eef7
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE