Nick Pelly 37b1741993 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-02 17:29:28 +00:00

assets/html

Fix to bug 3389385.

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

res

Merge "Strings edits to Security settings summaries. Also changed "must" to "need to" per preferred wording. Bugs: 5533152, 5163232"

2011-10-31 12:17:00 -07:00

src/com/android/settings

Merge "Using same task fixes 5486287"

2011-11-02 06:45:34 -07:00

tests

Unused assets removed from Settings

2011-10-28 17:41:08 -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%