app_Settings

Go to file

Julia Reynolds 84082aac24 Merge "Catch rule creation exceptions." into nyc-dev

am: f1c2e62f4e

* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
  Catch rule creation exceptions.

Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173

2016-05-16 18:29:21 +00:00

res

Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev

2016-05-13 18:57:00 +00:00

src/com/android/settings

Merge "Catch rule creation exceptions." into nyc-dev

2016-05-16 18:29:21 +00:00

tests

Import translations. DO NOT MERGE

2016-02-10 07:48:36 -08: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