Elliott Hughes 57d7fa545b resolved conflicts for merge of f90b5141 to master ...

Change-Id: I666b2fcde034f6dc9f7b69409facf88a4feb5309

2014-04-24 17:24:35 -07:00

res

Merge "Support ACTION_CHANGE_ACTIVE for network scorers."

2014-04-24 18:59:53 +00:00

src/com/android/settings

resolved conflicts for merge of f90b5141 to master

2014-04-24 17:24:35 -07: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

Support ACTION_CHANGE_ACTIVE for network scorers.

2014-04-24 11:27:47 -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%