Sanket Padawe 197976e6d1 resolve merge conflicts of 4e4a3f8 to master. ...

Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d

2014-10-30 11:05:55 -07:00

res

resolve merge conflicts of 4e4a3f8 to master.

2014-10-30 11:05:55 -07:00

src/com/android/settings

resolve merge conflicts of 4e4a3f8 to master.

2014-10-30 11:05:55 -07:00

tests

Import translations. DO NOT MERGE

2014-10-15 18:03:52 -07:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev

2014-10-30 11:06:53 +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%