FIX
Merge branch 'cm-11.0' of https://www.github.com/daydream-cm/android_packages_apps_CMAccount into cm-11.0