Update crom_strings.xml
Settings: Second Clock (2/2)

https://github.com/Dokdo-Project/platform_packages_apps_Settings/commit/ae92418a3e50fdae6891053492d155fc7e010e5f#diff-ad1634d6f24fb13c45a1137e95c26371R287

PS2: Fu Whitespace

Change-Id: Ie5ad1c877d86a5048dda6f14cf9ccef2d2819acb

Conflicts:
	res/values/crom_strings.xml
Merge pull request #11 from spillow64/patch-10

Update crom_strings.xml
Slim Recents: Option to show topmost task [2/2]

Change-Id: I46cd6d1141ffb6893c94b10a7f0d9d9f94b92ec1
Update App Circle Sidebar Options.
App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a
fix build
Revert "fix build"

This reverts commit c03dc473ed42c0c930aff7ea00f70f673a5ceeb0.
Revert "fixup"

This reverts commit acc8bc4e12b008d089d0a79b04e7b3f0dccd6af6.
Revert "Settings: Add compass tile (2/2)"

This reverts commit ed3e8d99e974641011518cf11161231ce48009f9.
fix fc
Merge remote-tracking branch 'upstream/kitkat' into kitkat

Conflicts:
	res/values/crom_strings.xml
	res/xml/app_circle_sidebar.xml
	res/xml/crom_interface_settings.xml
	res/xml/crom_settings.xml