The Android Open Source Project 0d59935d30 am c90961d4: Reconcile with ics-factoryrom-2-release ...

* commit 'c90961d43102563b540d719e637905570f9856e4':

2011-11-16 09:36:10 -08:00

assets/html

Fix to bug 3389385.

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

res

Fix 5579440: Add transport control view to tablet unlock screens

2011-11-14 14:08:47 -08:00

src/com/android/settings

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

2011-11-15 13:25:25 -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 "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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%