Victor Chang 53c30d2fd1 Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp ...

am: f1cbf0a3f2

* commit 'f1cbf0a3f267bf61ce15cd3272db987ff01e71ac':

Change-Id: I94f2784ab4ce93a01f9a16ed9873cb6974f6ffac

2016-05-24 14:43:47 +00:00

res

Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: e6e8c92134

2016-05-24 12:38:04 +00:00

src/com/android/settings

Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8cc4630521

2016-05-24 14:43:41 +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

…

NOTICE

…

proguard.flags

Create feature factory interface & initial impl.

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

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%