Narayan Kamath 62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp ...

Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a

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

res

am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text.

2014-12-12 19:08:46 +00:00

src/com/android/settings

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

2014-12-15 16:27:39 +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

Settings psuedolocalization fixes.

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

AndroidManifest.xml

[FRP] Screen Lock for Setup Wizard shows wrong title

2014-12-05 18:20:27 -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%