The Android Automerger 1b28d6c05a merge in master-release history after reset to 312c4573c3

2014-05-01 05:51:02 -07:00

res

Merge "Add condition provider access to settings."

2014-04-30 02:12:21 +00:00

src/com/android/settings

Switch to using the new enabled flag in UserInfo

2014-05-01 11:51:24 +01:00

tests

am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.

2014-04-05 00:54:54 +00:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Add condition provider access to settings.

2014-04-29 20:21:08 -04: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%