app_Settings

Go to file

Michael Chan 41eb38412a am 0c75b2d2: Merge change I80790bdb into eclair

Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.

2009-12-07 20:50:32 -08:00

res

am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:32 -08:00

src/com/android/settings

am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:32 -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

am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:32 -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