Build with Linaro add Logo
Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'origin/cm-11.0'

Conflicts:
	tools/releasetools/ota_from_target_files
Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'CyanogenMod/cm-11.0'
Merge branch 'CyanogenMod/cm-11.0'
Fix so things will pick
Merge branch 'cm-11.0X'