app_Settings

Go to file

Michael Chan fcd4e7fec3 am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair

Merge commit '04bdae750fe47d3a008af92c5bfb5eba1e0e6807' into eclair-plus-aosp

* commit '04bdae750fe47d3a008af92c5bfb5eba1e0e6807':
  b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.

2010-01-20 11:54:51 -08:00

res

am 63c6a309: Merge "Add dock icon for top-level settings. #2367275 " into eclair

2010-01-20 07:45:26 -08:00

src/com/android/settings

b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.

2010-01-19 22:35:28 -08:00

tests

Import revised translations. DO NOT MERGE

2009-11-16 16:45:29 -08:00

Android.mk

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

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

AndroidManifest.xml

am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275

2010-01-18 23:42:44 -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