app_Settings

Go to file

Victor Chang 0c9117a546 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862

am: 8a85828424

* commit '8a858284242d428e9db69d337a717a48edc88714':
  Trust the certificate after unlocking screenlock

Change-Id: I6ec7b8cc19605ede281c8ed1f80e7647a0edea51

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

res

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

2016-05-24 12:31:57 +00:00

src/com/android/settings

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

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

tests

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

2016-05-23 12:03:44 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00: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-19 23:01:49 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

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