The Android Automerger 850cb95af3 Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0" ...

This reverts commit 1b4f5d7435, reversing
changes made to 19d9a3d284.

2011-11-02 20:58:19 -07:00

assets/html

Fix to bug 3389385.

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

res

Import revised translations. DO NOT MERGE

2011-11-02 15:19:25 -07:00

src/com/android/settings

Revert "Merge "Fix WPS pin input UI" into ics-mr0"

2011-11-02 20:58:10 -07:00

tests

Import revised translations. DO NOT MERGE

2011-10-18 11:13:37 -07:00

Android.mk

CA certificate settings fragment

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

AndroidManifest.xml

Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

2011-11-02 20:58: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%