The Android Automerger 761ab6df10 merge in master-release history after reset to 645b709de8

2014-05-21 05:50:47 -07:00

res

Merge "Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut"

2014-05-21 02:25:34 +00:00

src/com/android/settings

Merge "Fix master: deleting remaining file from revert."

2014-05-21 00:56:30 +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

Don't build tests by default

2014-05-20 17:37:44 -07:00

AndroidManifest.xml

Revert "Settings for NFC Unlock"

2014-05-20 16:59:25 +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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%