The Android Automerger 153ab94502 merge in gingerbread-release history after reset to gingerbread

2011-03-18 10:42:03 -07:00

assets/html

String change - wifi tether = hotspot

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

res

DO NOT MERGE WiMAX settings menu

2011-03-09 23:02:21 -08:00

src/com/android/settings

DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter

2011-03-11 19:19:27 -05:00

tests

Import revised translations. DO NOT MERGE

2011-02-07 13:38:01 -08:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-05 16:29:09 -08:00

AndroidManifest.xml

DO NOT MERGE Do not allow shortcut for "4G Settings"

2011-03-16 18:10:28 -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

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%