Automatic translation import

Change-Id: I7a750d6e136de393db8e65959ead187e9464130c
Merge branch 'cm-11.0' into kk_mkt
Merge pull request #10 from MoKee/kk_mkt

Merge branch 'cm-11.0' into kk_mkt