Jim Miller 7da8cae44b Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE] ...

Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615

Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a

2011-01-09 13:57:53 -08:00

assets/html

String change - wifi tether = hotspot

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

res

Conditionally remove Dock settings shortcut and Power control widget.

2011-01-09 12:03:45 -08:00

src/com/android/settings

Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]

2011-01-09 13:57:53 -08:00

tests

Import revised translations.

2010-12-23 14:18:00 -08:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:23:20 -07:00

AndroidManifest.xml

Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]

2011-01-09 13:57:53 -08: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

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%