Paul Crowley 05c3b5e929 am a41edb6c: am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev automerge: 50c67366 ...

* commit 'a41edb6c662ba5fa42f0e57b8dc3e3612697e31f':
  Prevent factory reset for short passwords in CryptKeeper

2014-11-20 21:29:11 +00:00

res

Import translations. DO NOT MERGE

2014-11-19 11:19:12 -08:00

src/com/android/settings

am 158717ed: am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev automerge: 4a0d6f3

2014-11-20 21:13:25 +00:00

tests

Import translations. DO NOT MERGE

2014-11-10 14:33:04 -08:00

Android.mk

Settings psuedolocalization fixes.

2014-08-22 12:24:00 -07:00

AndroidManifest.xml

am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev

2014-11-18 20:17:50 +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%