suspend actions (2/2)

Change-Id: Ib978ca70ebb98559f70f98013fea61fab2886810

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/aokp/romcontrol/CreateShortcut.java

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/crom/settings/CreateShortcut.java