app_Settings

Go to file

Eric Fischer 0b5b53e9ed am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread

Merge commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c'

* commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
  Import revised translations.  DO NOT MERGE

2010-09-30 18:13:01 -07:00

assets/html

String change - wifi tether = hotspot

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

res

keep screen on in setup wizard datetime and wifi settings activities

2010-09-30 17:32:01 -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

Fix proguard flag file dependency.

2010-09-30 13:23:20 -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