Amit Mahajan 8151ef29aa resolved conflicts for merge of 88b2790d to lmp-sprout-dev ...

Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903

2014-10-10 17:17:53 -07:00

res

Merge "Removing display number format from SIM UI" into lmp-sprout-dev

2014-10-09 00:33:10 +00:00

src/com/android/settings

am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

2014-10-09 19:29:33 +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

[WifiSetup] Disable app starting window

2014-09-15 11:40:34 -07: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%