Sudheer Shanka ad93666f4e Merge "Part1 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: f498c8ddc1 ...

am: bea4c54f73

* commit 'bea4c54f73b38ca9554ea51554e4580bff4ab1d1':
  Part1 - Don't add padlock if the restriction is not set by admin.

2016-02-19 19:43:36 +00:00

..

res

Merge "Update string used as summary when an option is disabled by policy." into nyc-dev am: 82f927bd28

2016-02-19 18:31:30 +00:00

src/com/android/settingslib

Part1 - Don't add padlock if the restriction is not set by admin.

2016-02-19 19:21:57 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

2016-01-12 18:14:24 +00:00

AndroidManifest.xml

…

common.mk

…