Automatic translation import

Change-Id: I79229f7208d13209d6fc2ea9ac1594027279ab0f
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'androidarmv6/cm-11.0'