Jean-Baptiste Queru e742d42d54 am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward ...

Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286'

* commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286':
  Import revised translations

2010-08-24 11:55:38 -07:00

assets/html

String change - wifi tether = hotspot

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

res

resolved conflicts for merge of dbdbd152 to master

2010-08-24 10:13:00 -07:00

src/com/android/settings

Merge "Match devices by Class for tethering."

2010-08-23 15:58:37 -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

Refactor settings top level activities to use fragments.

2010-08-18 22:59:33 -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

Fix proguard flags for settings.

2010-08-19 10:26:40 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%