Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
framework: fix lunar 30 display text

Change-Id: Ibe3c0c69b27313bb96c92567eadc7af9db0ecab9
frameworks: update translations

Change-Id: Ib06c1bd2ea453b56f372062192515ecb586ea942
Merge branch 'cm-10.1' into martincz
frameworks: Simplified Chinese Translations

Change-Id: Ic6fc52eb74ad21a68ea2f1c929f2a06ac1b99c56
Merge remote-tracking branch 'mokee/jb-mr-2_mkt' into HEAD

Conflicts:
	core/res/res/values/public.xml

Change-Id: I3b4c93be046d2b7e38b58d3633bf2702de63236d