app_Settings

Go to file

The Android Open Source Project 2e6d38fee2 am bd5e37bc: am 0ad13892: Reconcile with ics-factoryrom-2-release

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

2011-11-04 15:03:08 +00:00

assets/html

Fix to bug 3389385.

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

res

am f53c3602: Bring back Android Dreams.

2011-11-03 11:01:56 +00:00

src/com/android/settings

am f53c3602: Bring back Android Dreams.

2011-11-03 11:01:56 +00:00

tests

Import revised translations.

2011-11-02 10:30:43 -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