app_Settings

Go to file

Tony Mak b38b537983 resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787

am: 2211926ac4

* commit '2211926ac4c24fcdfc635d58dc8c2dd2ec029d1c':
  Add managed profile setting page

Change-Id: I16a93e4527468de9005db3adfa598a924a3efa19

2016-05-04 10:46:45 +00:00

res

resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787

2016-05-04 10:46:45 +00:00

src/com/android/settings

resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787

2016-05-04 10:46:45 +00: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