Fix aapt warning.

Change-Id: I078a46a34f6f417558181b4a38bb5ebfbb7d6558
Update German translation.

Change-Id: Ie00139a6ed57bb84a01c3a09d1b1483869ff85f8
Merge remote-tracking branch 'cm/cm-10.2' into HEAD