Eric Fischer d947937f4d resolved conflicts for merge of 92acdba0 to master ...

Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879

2010-10-21 18:31:02 -07:00

assets/html

String change - wifi tether = hotspot

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

res

resolved conflicts for merge of 92acdba0 to master

2010-10-21 18:31:02 -07:00

src/com/android/settings

am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread

2010-10-21 13:50:02 -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

am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread

2010-10-21 13:46:55 -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

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%