Amith Yamasani 52c3a2d719 am d505dcbd: am 95a5169d: am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev ...

* commit 'd505dcbd666d8a208d267ce9c78cf7b4d41c5142':
  Disable factory reset for secondary users

2014-10-23 22:31:18 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-10-22 23:57:49 +00:00

src/com/android/settings

am d505dcbd: am 95a5169d: am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev

2014-10-23 22:31:18 +00: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 f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

2014-10-15 21:23:51 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%