The Android Automerger 43a37cf1ad merge in master-release history after reset to master

2014-04-01 05:51:34 -07:00

res

Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)."

2014-04-01 01:21:23 +00:00

src/com/android/settings

Add initial trust agent settings

2014-03-31 23:00:51 +02:00

tests

Use Drawer in Settings app

2014-02-03 16:36:46 -08:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Settings - update for new UI (no more Drawer)

2014-03-28 15:51:29 -07: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

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%