app_Settings

Go to file

Maurice Lam 2ddf85b94b Merge "Add activity label to encryption interstitial" into nyc-dev

am: 19c0046422

* commit '19c0046422e0cf5586e37323157a27331db45572':
  Add activity label to encryption interstitial

Change-Id: I6aef221cd49b0bab4ae7da332f388865effb4e20

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

res

Merge "Importance slider updates." into nyc-dev

2016-05-26 17:37:02 +00:00

src/com/android/settings

Merge "Importance slider updates." into nyc-dev

2016-05-26 17:37: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 "Add activity label to encryption interstitial" into nyc-dev

2016-05-26 23:58:26 +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