Geoff Mendal 36be61cb14 Import translations. DO NOT MERGE automerge: 60d2ee8 -s ours ...

automerge: 96a90af  -s ours

* commit '96a90af83bddfec535bc4ebe96545145d0b33285':
  Import translations. DO NOT MERGE

2015-02-11 15:04:20 +00:00

res

Merge "Replace data_usage_bar with progress background tint"

2015-02-11 00:42:38 +00:00

src/com/android/settings

Merge "Make Settings > Security > Apps with Usage Access multiprofile aware"

2015-02-09 15:03:00 +00:00

tests

Import translations. DO NOT MERGE

2015-01-21 07:12:37 -08:00

Android.mk

Make Settings include new SettingsLib

2015-02-04 15:35:05 +00:00

AndroidManifest.xml

Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb automerge: c1af278

2015-02-03 18:24:42 +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%