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

2011-11-17 07:01:38 -08:00

assets/html

Fix to bug 3389385.

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

res

am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1

2011-11-17 05:45:36 -08:00

src/com/android/settings

am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1

2011-11-15 13:29:01 -08:00

tests

Import revised translations.

2011-11-02 10:30:43 -07:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Merge "Dismiss dialogs properly on closing." into ics-mr1

2011-11-15 10:12:32 -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

Add PowerUsageSummary to proguard list.

2011-06-29 17:24:14 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%