Fix mismerge of implement 1% battery on select devices

Change-Id: I2dcafba2c39f50cf435b90ca261b325c10fd5b6b
Revert "SystemUI & core: FI translations"

Derp

This reverts commit 4fc0d45650edce7b673153ad1ae17dc8b90ec1b1.

Change-Id: I81ebe10eba1d2f659e98678918db6e5cec42eb63
Core: Update German translation

Change-Id: Ib7f25bb48de3eb33eeefd07a0e1ff493fbe68b80
Fix fetching icons from packages.

Change-Id: I857d35bb601425be56b5eb730d63344e1173e4a2
Merge "Fix fetching icons from packages." into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2