packages_apps_Settings

Go to file

Bill Yi 7b04f56164 Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours am: 1f055cb81d -s ours

am: c90e7685ca  -s ours

* commit 'c90e7685ca86ae0f7eec8abb661e69b16a0561eb':
  Import translations. DO NOT MERGE

Change-Id: Ia2f0c20ed0eb85f2de4b61b6a38e436bae94bbbb

2016-06-04 00:24:23 +00:00

res

Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf am: 8a1d371239

2016-06-04 00:24:22 +00:00

src/com/android/settings

Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 am: 7469d799a8

2016-06-03 17:36:16 +00:00

tests

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

2016-05-23 12:09:38 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-13 13:02:38 -07:00

AndroidManifest.xml

Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506

2016-06-01 17:42:36 +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-13 13:02:38 -07:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

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