P1: DA translation

Change-Id: I89263d04b2cbf4485f111b9c1350c63a9d2db193
Merge branch 'cyanogenmod' into cm-10.2