The Android Automerger c510f255d3 merge in master-release history after reset to b654a07263

2014-05-20 05:50:38 -07:00

res

Merge "Update Search results layout"

2014-05-19 23:56:39 +00:00

src/com/android/settings

Merge "Fix bug #15086008 NPE observed after user setup device daydream followed by device orientation"

2014-05-20 00:32:37 +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

VolumeZen: Sound & Notifications settings.

2014-05-18 15:37:09 -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

VolumeZen: Sound & Notifications settings.

2014-05-18 15:37:09 -04:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%