The Android Open Source Project 442c45ad09 am 2fd22409: Reconcile with ics-factoryrom-2-release ...

* commit '2fd224095660d28dca0291a118db08f8cf29fd0d':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

2011-11-02 17:59:04 +00:00

assets/html

Fix to bug 3389385.

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

res

Import revised translations. DO NOT MERGE

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

src/com/android/settings

am 1484531a: am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0

2011-11-02 17:50:26 +00: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

Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.

2011-10-31 14:56:18 -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%