Fyodor Kupolov 2b242223e6 am d5363a1e: am 32f0525c: am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae ...

* commit 'd5363a1e3ca129fceed8a8b36de66611e4219819':

2015-01-29 20:03:26 +00:00

res

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

2015-01-28 21:28:39 +00:00

src/com/android/settings

Merge "Use primaryUserOnly attribute to disable CryptKeeper"

2015-01-28 22:52:46 +00:00

tests

Import translations. DO NOT MERGE

2015-01-21 07:12:37 -08:00

Android.mk

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

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

AndroidManifest.xml

Use primaryUserOnly attribute to disable CryptKeeper

2015-01-27 12:07:16 -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%