Geoff Mendal f4edd27a3a am e5e08d93: (-s ours) am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev ...

* commit 'e5e08d93b15d5dded447ff99cfc51a29fb2d6fd4':
  Import translations. DO NOT MERGE

2014-10-16 18:13:05 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-10-16 01:05:00 +00:00

src/com/android/settings

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

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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%