The Android Automerger ece4bca2c4 Merge branch 'master' into honeycomb-release

2010-11-18 07:41:06 -08:00

assets/html

String change - wifi tether = hotspot

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

res

Merge "Use the new Preference:icon attribute and placeholder for showing icons on the left."

2010-11-17 16:39:36 -08:00

src/com/android/settings

Merge "Use the new Preference:icon attribute and placeholder for showing icons on the left."

2010-11-17 16:39:36 -08:00

tests

Import revised translations.

2010-11-09 17:42:54 -08:00

Android.mk

Fix proguard flag file dependency.

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

AndroidManifest.xml

Jump to top-level settings when launched from system bar or Settings shortcut.

2010-11-16 05:00:28 -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

Fragmentize "Factory reset" setting screen.

2010-11-03 12:04:16 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%