Nick Pelly 1ed27d9420 am 299078e1: am 1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0 ...

* commit '299078e1600325653b579c7dd8bb4dbc2666c49e':
  Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.

2011-11-01 00:06:23 +00:00

assets/html

Fix to bug 3389385.

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

res

Merge remote branch 'goog/ics-mr1' into ics-aah

2011-10-31 05:54:48 -07:00

src/com/android/settings

am df8c7aa2: am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0

2011-10-31 21:05:26 +00:00

tests

Import revised translations.

2011-10-18 15:45:53 -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%