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

am: f498c8ddc1

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

2016-02-19 19:38:09 +00:00

..

res

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

2016-02-19 18:25:57 +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

…