app_Settings

Go to file

Etan Cohen 96c47d45e7 Merge changes from topic 'mwd-merge-040115'

* changes:
  Merge commit '279cb4a' into merge
  Merge commit '898e486' into merge
  Merge commit 'fc75374' into merge
  Merge commit '2241607' into merge
  Merge commit 'fe47522' into merge

2015-04-02 03:07:52 +00:00

res

Merge changes from topic 'mwd-merge-040115'

2015-04-02 03:07:52 +00:00

src/com/android/settings

Merge changes from topic 'mwd-merge-040115'

2015-04-02 03:07:52 +00:00

tests

Import translations. DO NOT MERGE

2015-03-21 02:21:25 -05:00

Android.mk

Make Settings include new SettingsLib

2015-02-04 15:35:05 +00:00

AndroidManifest.xml

Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests

2015-03-31 20:13:25 +01:00

CleanSpec.mk

Finally, a place for notification settings.

2014-03-12 14:15:09 -04: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

Add option to reset network settings to factory

2015-03-09 13:18:50 -07:00