app_Settings

Go to file

Victor Chang 24b39dce00 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854

am: 5ab70294ed

* commit '5ab70294ed03f83fd0789477a005225d8caebd5c':
  Show different strings when PO/DO user approves a cert

Change-Id: Ib0e1fc2a8f086e7ebf06b3f745f18c343a9ac682

2016-06-01 10:18:07 +00:00

res

Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156

2016-06-01 09:48:27 +00:00

src/com/android/settings

Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854

2016-06-01 10:18:07 +00:00

tests

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

2016-05-23 12:03:44 +00:00

Android.mk

Create feature factory interface & initial impl.

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

AndroidManifest.xml

Merge "Add an automatic storage management job service." into nyc-mr1-dev

2016-05-31 18:31:32 +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