Automatic translation import

Change-Id: Idb2353d0fa3ea7302a15a3fd4fcb4a6376f7b22c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge pull request #1 from androidarmv6/cm-11.0

1