Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1

This commit is contained in:
jdeckerMS
2016-05-16 14:20:49 -07:00

View File

@ -429,6 +429,9 @@ You can specify the quick actions as follows:
<System name="SystemSettings_BatterySaver_LandingPage_OverrideControl" />
<System name="SystemSettings_QuickAction_QuietHours" />
<System name="SystemSettings_QuickAction_Camera" />
<System name="SystemSettings_Launcher_QuickNote" />
<System name="QuickActions_Launcher_AllSettings" />
<System name="QuickActions_Launcher_DeviceDiscovery" />
</Settings>
```