Robin Lee 33a72635a6 Merge "Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: cb5c925432" into nyc-mr1-dev-plus-aosp ...

am: d34faeaded

* commit 'd34faeaded2705b3cd70ef9b30b93aba2dea3a94':

Change-Id: I8810a87d00bd90d505a5daa658ed674182bdb108

2016-05-25 21:38:38 +00:00

res

Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev am: 668c297603

2016-05-25 20:08:03 +00:00

src/com/android/settings

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: 74cc9772e9

2016-05-25 21:37:47 +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

Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev

2016-05-14 01:23:28 +00: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%