app_Settings

Go to file

Amith Yamasani 1a8cb120b1 am e2caf2ee: Merge change I82be95f6 into eclair

Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2

* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
  Feature #2296147	Settings for Car/Desk Dock on certain devices

2009-12-02 15:47:19 -08:00

res

am e2caf2ee: Merge change I82be95f6 into eclair

2009-12-02 15:47:19 -08:00

src/com/android/settings

am e2caf2ee: Merge change I82be95f6 into eclair

2009-12-02 15:47:19 -08:00

tests

b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth

2009-11-05 18:32:09 -08:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:14 -07:00

AndroidManifest.xml

Switched Settings to use the new Gmail permission name space

2009-11-20 17:12:36 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00