Mark Salyzyn 6b5bcd2138 resolved conflicts for merge of c2c64a31 to master ...

Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a

2014-06-13 14:57:13 -07:00

res

resolved conflicts for merge of c2c64a31 to master

2014-06-13 14:57:13 -07:00

src/com/android/settings

resolved conflicts for merge of c2c64a31 to master

2014-06-13 14:57:13 -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

Don't build tests by default

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

AndroidManifest.xml

am 3864cda8: Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev

2014-06-12 18:37:35 +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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%