app_Settings

Go to file

Baligh Uddin 69d6fd5f0f Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp

am: ce437f6f71  -s ours

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

Change-Id: I0c7c45300f6f2ca1ce93ffe016c6a95d56fc51ca

2016-05-10 18:27:19 +00:00

res

resolve merge conflicts of b59dbf6 to master

2016-05-10 11:17:28 -07:00

src/com/android/settings

resolve merge conflicts of b59dbf6 to master

2016-05-10 11:17:28 -07:00

tests

Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev

2016-04-21 17:27:16 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd

2016-04-28 13:02:51 +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-19 23:01:49 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

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