app_Settings

Go to file

Robin Lee 2e98acf1ba Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2

am: 74cc9772e9

* commit '74cc9772e9769b8c6a8cd6a6bb36cc8cfd5efb74':
  Don't crash trying to disable lockdown VPN

Change-Id: I8f69b83a4bf66b022f58d8deb9e70e911801b960

2016-05-25 21:28:35 +00:00

res

Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev

2016-05-25 20:04:06 +00:00

src/com/android/settings

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2

2016-05-25 21:28:35 +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 Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev

2016-05-14 01:23:28 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Create feature factory interface & initial impl.

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

wrap_alpha.py

…