Eric Fischer 297231ca4f resolved conflicts for merge of 67a50f99 to ics-aah ...

Change-Id: I14ffa78c503c91b615e353941a79ea0f8a85bb5a

2012-02-02 14:02:44 -08:00

assets/html

Fix to bug 3389385.

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

res

resolved conflicts for merge of 67a50f99 to ics-aah

2012-02-02 14:02:44 -08:00

src/com/android/settings

am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

2012-01-20 14:42:34 -08:00

tests

Import revised translations. DO NOT MERGE

2011-11-29 13:18:54 -08: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%