Sanket Padawe 2493118a3c Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb ...

automerge: c1af278

* commit 'c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
  Remove SimDialogActivity from recents app list.

2015-02-03 18:19:05 +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

Remove SimDialogActivity from recents app list.

2015-02-02 16:46:55 -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%