Correctly mark string as untranslatable.

Change-Id: I16bfcfec75aa28210e5008d65845916ef2fbb23d
merge changes from CyanogenMod 10.2 into local branch
Fix assigning apps to navigation ring.

Change-Id: I78863dd1ea9b07b5cd4fa4fbedc8a4700abffabd