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

2011-09-20 07:01:10 -07:00

assets/html

Fix to bug 3389385.

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

res

am 1e596f30: Add Button to *#*#INFO#*#* for ims registration.

2011-09-19 15:02:02 -07:00

src/com/android/settings

am 1e596f30: Add Button to *#*#INFO#*#* for ims registration.

2011-09-19 15:02:02 -07:00

tests

Import revised translations.

2011-08-22 11:34:42 -07:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Mark Settings as a "core" app.

2011-09-19 14:27:13 -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

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%