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

am: 32e17d0862

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

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5

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

res

Import translations. DO NOT MERGE

2016-05-21 13:10:17 -07:00

src/com/android/settings

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

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

tests

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

2016-05-23 11:58:58 +00:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""

2016-02-16 17:22:08 -08:00

AndroidManifest.xml

Merge "Disable WebViewSetting for non-admin users." into nyc-dev

2016-05-12 13:29:11 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Add Tron Logging to portion of A11y SUW that lives in Settings.

2016-04-01 14:34:17 -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%