app_Settings

Go to file

Victor Chang 8a85828424 Merge "Trust the certificate after unlocking screenlock" into nyc-dev

am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de

2016-05-24 14:20:01 +00:00

res

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

2016-05-24 12:23:20 +00:00

src/com/android/settings

Merge "Trust the certificate after unlocking screenlock" into nyc-dev

2016-05-24 14:20:01 +00:00

tests

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

2016-05-23 11:59:19 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

Add an Activity to handle Intents to invoke the Deletion Helper.

2016-05-13 17:03:30 -07: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-19 23:01:49 +00:00

wrap_alpha.py

…