core: SK translations

Change-Id: I8c5bfe319971e1da180d539be24d7fd03263913b
Fix expanded desktop layout in landscape

Change-Id: I9292ff994c2b5b185d47222be98665f36e528068
Merge "core: SK translations" into cm-10.2
NFC polling mode (3/3)

Change-Id: Ia03413578d47e7cd0ffb3080778b6a1154cfc651

Conflicts:
	core/java/android/provider/Settings.java