PauloftheWest 5200f61ede am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev ...

automerge: 735e93e

* commit '735e93e52c59e13a27f24170c5e41ca22d5e4e6a':
  Fixed then icons of SIMs in the call dialog.

2014-12-16 01:41:48 +00:00

res

am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev

2014-12-15 22:41:52 +00:00

src/com/android/settings

am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev

2014-12-16 01:41:48 +00:00

tests

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

2014-12-15 16:27:39 +00:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

[FRP] Open the lock setup screens in same task

2014-12-11 18:22:08 -08: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%