Zoltan Szatmary-Ban 74dc5fb345 am b8acc5ac: am 9cb9286d: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev ...

* commit 'b8acc5ac4d84368fb953b0ee7b29ed014cb67733':

2014-10-27 20:38:44 +00:00

res

Import translations. DO NOT MERGE

2014-10-27 10:03:05 -07:00

src/com/android/settings

am a30955a6: am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

2014-10-25 03:42:06 +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%