Andres Morales 4bd31b9ac6 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter ...

automerge: 98d8a49

* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
  Use getDefaultAdapter instead of getNfcAdapter

2015-02-03 16:01:45 +00:00

res

Import translations. DO NOT MERGE

2015-02-02 06:52:47 -08:00

src/com/android/settings

am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter

2015-02-03 16:01:45 +00:00

tests

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

2014-12-15 16:27:39 +00:00

Android.mk

Add button in "hidden" settings to flip "VoLTE Provisioned" flag

2015-01-22 02:57:37 +00:00

AndroidManifest.xml

[WifiSetup] Don't pan the window for IME

2015-01-15 11:55:15 -08:00

CleanSpec.mk

Finally, a place for notification settings.

2014-03-12 14:15:09 -04: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

VolumeZen: Sound & Notifications settings.

2014-05-18 15:37:09 -04:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%