Robin Lee 65c8dd536b Merge \"Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: 442498681d\" into nyc-mr1-dev-plus-aosp ...

am: 14cc0fd5a3

Change-Id: I1b52da55c4a5ee489492d07c4c54089f6662f49c

2016-06-13 16:23:02 +00:00

res

resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp am: f8c135a986

2016-06-11 05:22:06 +00:00

src/com/android/settings

Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: c7f0f2338a

2016-06-13 16:23:01 +00:00

tests

Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: e8df0892d4

2016-05-23 12:09:38 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp

2016-06-08 15:28:48 -04:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07: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

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%