Geoff Mendal 59945e0265 am 7b18e2f2: (-s ours) am 78819ec3: (-s ours) am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev ...

* commit '7b18e2f2feeacf4341a73884d033c23c3b16920d':
  Import translations. DO NOT MERGE

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

res

Merge "Import translations. DO NOT MERGE"

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

src/com/android/settings

am 49c5efde: am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes

2014-10-22 22:51:07 +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%