The Android Automerger 26cc58210c merge in master-release history after reset to master

2014-04-08 05:50:15 -07:00

res

Import translations. DO NOT MERGE

2014-04-07 12:14:13 -07:00

src/com/android/settings

Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

2014-04-07 08:59:27 +00: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

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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%