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

2011-09-08 06:34:54 -07:00

assets/html

Fix to bug 3389385.

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

res

Merge "Show factory reset option if encryption went bad."

2011-09-07 15:29:49 -07:00

src/com/android/settings

Merge "Use hasSystemFeature() to check for p2p"

2011-09-07 17:07:58 -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

Enforce permissions for connection dialog intents.

2011-09-07 17:19:19 -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%