Automatic translation import

Change-Id: Ib0ede62a119aa9c66dcbf70d2dd769ff9dbce52f
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge pull request #1 from cristianomatos/cm-11.0

merge cm 11