app_Settings

Go to file

Robin Lee cb5c925432 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev

am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: Ic83af8894c66947586d84ebdbfa667a6b1d2a93c

2016-05-25 21:20:48 +00:00

res

Import translations. DO NOT MERGE

2016-05-23 06:35:00 -07:00

src/com/android/settings

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev

2016-05-25 21:20:48 +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

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

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