Dmitry Dementyev e24780ed4c resolve merge conflicts of 75ae46d035 to lmp-mr1-dev ...

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:

2017-03-07 19:52:02 -08:00

res

Import translations. DO NOT MERGE

2015-09-25 13:05:09 -07:00

src/com/android/settings

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev

2017-03-07 19:52:02 -08:00

tests

Import translations. DO NOT MERGE

2014-08-24 13:07:11 -07: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%