Dan Morrill 82884deb0e Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix ...

Conflicts:
	res/values/strings.xml

Change-Id: I5da845de77ffd95c5008fdc081cc1e3abef4fad5

2010-10-18 16:11:35 -07:00

assets/html

String change - wifi tether = hotspot

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

res

Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix

2010-10-18 16:11:35 -07:00

src/com/android/settings

Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix

2010-10-18 15:23:16 -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

Turn on hardware acceleration of rendering.

2010-10-14 17:38:48 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%