Julia Reynolds ebef0414ae Merge "Notification slider update." into nyc-dev ...

am: 9e8bc7c

* commit '9e8bc7c68584ccec5cf78a9bc5786955898965bd':
  Notification slider update.

Change-Id: Ie3884755eb405016b74ec58f713d5ef723baffc2

2016-04-15 15:23:50 +00:00

..

res

Merge "Notification slider update." into nyc-dev

2016-04-15 15:23:50 +00:00

src/com/android/settingslib

Merge "Update RestrictedSwitchPreference to have an additional summary." into nyc-dev

2016-04-14 21:05:26 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

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

AndroidManifest.xml

…

common.mk

…