PauloftheWest 900bdb3388 am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev ...

automerge: d54211c

* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
  SIM cards in Setting will only show on Multi-SIM devices

2014-12-09 23:16:39 +00:00

res

am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev

2014-12-09 23:15:46 +00:00

src/com/android/settings

am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev

2014-12-09 23:16:39 +00:00

tests

Import translations. DO NOT MERGE

2014-12-08 06:51:46 -08:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev

2014-12-09 23:15:37 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%