Paul Crowley 67b4af148d Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev ...

Conflicts:
	src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da

2014-11-20 10:37:39 +00:00

res

Import translations. DO NOT MERGE

2014-11-19 11:03:40 -08:00

src/com/android/settings

Merge "Added a check if a custom activity can be started" into lmp-mr1-dev

2014-11-19 22:20:25 +00:00

tests

Import translations. DO NOT MERGE

2014-08-24 13:07:11 -07:00

Android.mk

Settings psuedolocalization fixes.

2014-08-22 12:24:00 -07:00

AndroidManifest.xml

Merge "Created Multi-SIM notifications." into lmp-mr1-dev

2014-11-17 22:50:08 +00: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%