DeskClock: Add back user-defined world cities

Ported from:
 * http://review.cyanogenmod.org/#/c/33001/
 * http://review.cyanogenmod.org/#/c/44805/

Patchset 2: Rebase dependency

Change-Id: Iefbf8fa2c3d0d537d85cf734300f3ce2df6ae315
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Derp

Change-Id: I6f61ede2961b0eda6d2c895bd05b277097bca3df
DeskClock: Add back flip and shake actions

Cherry-picked and ported from:
 * http://review.cyanogenmod.org/#/c/29894/

Change-Id: I222b6cd53a95db6f8662e7aef52aa6922d8a5d6a
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	res/values/cm_strings.xml
	res/xml/settings.xml
	src/com/android/deskclock/SettingsActivity.java