app_Settings

Go to file

Bill Yi ba4dfdf8c1 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: da38e871de -s ours" into nyc-mr1-dev-plus-aosp

am: 3856317f50  -s ours

* commit '3856317f50d44eb1667fb4d7684184848ec5fcf9':
  Import translations. DO NOT MERGE

Change-Id: Ied54ef6f58473e82656adbe049d73b94c09b0966

2016-06-01 15:31:04 +00:00

res

Merge "Import translations. DO NOT MERGE"

2016-06-01 15:18:37 +00:00

src/com/android/settings

Disable restricted VPN actions onResume am: 52541536d0 am: 849edeb23e

2016-06-01 14:30:49 +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 "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-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