Chung-yih Wang 56f56a1f99 resolved conflicts for merge of 2af8a007 to master ...

Change-Id: I4a9aed673b0b57789d61f95129ca882dc46b415a

2010-09-11 11:51:53 +08:00

assets/html

String change - wifi tether = hotspot

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

res

am 40230c14: am 33319b12: Bluetooth PIN is not password style

2010-09-10 16:22:16 -07:00

src/com/android/settings

Fragmentize TetherSettings and WifiApSettings.

2010-09-10 12:07:58 -07:00

tests

Merge "Import Romansh translations."

2010-08-19 12:01:34 -07:00

Android.mk

Create LocalePickerFragment for fragmentizing LocalePicker Activity.

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

AndroidManifest.xml

am 8ce1853f: am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."

2010-09-10 16:22:20 -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

Add Wifi Setup screen for Setup Wizard with XL size screen.

2010-09-01 16:17:51 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%