PauloftheWest ee6426af18 am 7741dff8: am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev automerge: 3df1fe0 ...

* commit '7741dff861d341d427025a5147b9fadc4f3484b9':
  Made the WPS icon visisble.

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

res

am 7741dff8: am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev automerge: 3df1fe0

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

src/com/android/settings

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

2014-12-16 01:48:19 +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

am befc1267: am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev

2014-12-15 22:03:39 +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%