The Android Automerger 2e95ba0f24 merge in ics-release history after reset to master

2011-06-29 06:46:29 -07:00

assets/html

Fix to bug 3389385.

2011-01-26 12:27:44 -08:00

res

Merge "Follow naming conventions of proguard.flags"

2011-06-28 20:05:46 -07:00

src/com/android/settings

Merge "Follow naming conventions of proguard.flags"

2011-06-28 20:05:46 -07:00

tests

Import revised translations.

2011-06-20 14:54:12 -07:00

Android.mk

CA certificate settings fragment

2011-06-27 15:16:42 -07:00

AndroidManifest.xml

Split ActionBar in Settings

2011-06-27 17:00:23 -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

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%