Jason Simmons f75335564e resolved conflicts for merge of 322da591 to ics-aah ...

Change-Id: I4cd3301cf448761b2585c16f83787f6f2c9007b9

2011-11-08 10:23:15 -08:00

assets/html

Fix to bug 3389385.

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

res

resolved conflicts for merge of 322da591 to ics-aah

2011-11-08 10:23:15 -08:00

src/com/android/settings

resolved conflicts for merge of 322da591 to ics-aah

2011-11-08 10:23:15 -08:00

tests

Import revised translations. DO NOT MERGE

2011-11-01 13:37:58 -07:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1

2011-11-08 10:01:30 -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%