Unbreak PIN/Password lockscreen options

Change I0211deea61b2d5b048deb118c30fc1397a56d3ee slightly changed
the validation conditions for this case, fixit.

Change-Id: I6219f47f4b0acb87b5d8d4a121480b09a8aa12b2
CM PlatLogo: CyanogenMod version preference (2/2)

Binds the CyanogenMod version preference to launch CM easter egg
upon multiple taps.

Change-Id: I8e06642944d24581c0932c9964f2d9615bfcb832
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: Ib3e6f13c305a0c5064ccef55aa4358f98cee93d4