The Android Automerger 26a9532e43 merge in ics-release history after reset to master

2011-06-27 06:51:13 -07:00

assets/html

Fix to bug 3389385.

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

res

Merge "Settings: add a new layout for VpnSettings."

2011-06-26 19:46:38 -07:00

src/com/android/settings

Merge "Settings: revise VpnSettings."

2011-06-26 19:26:15 -07:00

tests

Import revised translations.

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

Android.mk

Checkpoint of data usage UI, graphs and lists.

2011-06-09 09:26:30 -07:00

AndroidManifest.xml

Turn off hardware acceleration to avoid crashes due to driver.

2011-06-23 15:24:06 -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%