Eric Fischer 9fc1f468f4 resolved conflicts for merge of cf18672a to master ...

Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1

2010-09-30 10:56:10 -07:00

assets/html

String change - wifi tether = hotspot

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

res

resolved conflicts for merge of cf18672a to master

2010-09-30 10:56:10 -07:00

src/com/android/settings

Merge commit '47ad0cf3' into manualmerge

2010-09-30 11:54:31 +09:00

tests

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

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

Android.mk

Create LocalePickerFragment for fragmentizing LocalePicker Activity.

2010-08-13 13:36:51 -07:00

AndroidManifest.xml

resolved conflicts for merge of 1ff9ad3f to master

2010-09-29 12:10:35 -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%