Fix mis-merge from cc2c404080b25a145190f135bf987e30a4f44f0f
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Merge branch 'sm-jb-mr1-qs' of git://github.com/SaberMod/android_packages_apps_Settings into sm-jb-mr1-qs
Settings: Add Quick Settings Sync tile (1 of 2)

Also, put tiles in alpha order

Change-Id: I8fcb229f7c123529ed273a34138c0306345f237d