app_Settings

Go to file

Jaikumar Ganesh 0d711637a2 am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread

Merge commit '836b4297ccde47ae6356b2a805394d3285368144'

* commit '836b4297ccde47ae6356b2a805394d3285368144':
  DO NOT MERGE Add null check before disconnecting a device.

2010-10-15 00:06:02 -07:00

assets/html

String change - wifi tether = hotspot

2010-05-08 17:20:26 -07:00

res

am f4e4319f: am 083310d3: Update NFC settings description, and fix polarity.

2010-10-14 22:14:34 -07:00

src/com/android/settings

am f4e4319f: am 083310d3: Update NFC settings description, and fix polarity.

2010-10-14 22:14:34 -07:00

tests

am 5496db04: am 59091c08: Fix Bluetooth device name max length checking.

2010-09-22 17:05:30 -07:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:23:20 -07:00

AndroidManifest.xml

resolved conflicts for merge of 0eb550ef to master

2010-10-10 08:25:21 -07:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -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

proguard.flags

Fragmentize BluetoothSettings.

2010-09-13 16:18:05 -07:00