The Android Automerger 94f1877edb merge in honeycomb-release history after reset to honeycomb

2011-01-23 07:22:11 -08:00

assets/html

String change - wifi tether = hotspot

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

res

Merge "New Settings assets" into honeycomb

2011-01-21 14:52:57 -08:00

src/com/android/settings

Merge "Accquire a wakelock while encrypting." into honeycomb

2011-01-21 14:18:52 -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

Add start-encryption intent filter to settings

2011-01-21 13:38:45 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%