Geoff Mendal d01083d193 am 2ef9983d: (-s ours) am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours automerge: 967c000 -s ours ...

* commit '2ef9983d4eff175364fd963db7df8a8392b5bd4e':
  Import translations. DO NOT MERGE

2014-10-28 07:17:40 +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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%