Julia Reynolds e3b081218b Merge "Notification slider update." into nyc-dev am: 9e8bc7c ...

am: ebef041

* commit 'ebef0414aeb61e428ecb532808a14cf30071750f':
  Notification slider update.

Change-Id: I9abd19ac95ddbd1718dece8d42f17fbdcd814f76

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

..

res

Merge "Notification slider update." into nyc-dev am: 9e8bc7c

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

src/com/android/settingslib

Merge "Update RestrictedSwitchPreference to have an additional summary." into nyc-dev am: 3ee2cc6

2016-04-14 21:17:03 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

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

AndroidManifest.xml

…

common.mk

…