Sanket Padawe ce1bfbb04e resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp ...

Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80

2014-10-09 20:19:59 -07:00

res

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

2014-10-09 20:19:59 -07:00

src/com/android/settings

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

2014-10-09 13:03: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%