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
frameworks_base: ES translations

- SELinux support
- Hangouts translation
- Restore two lines to quicksettings

Change-Id: Iffe9a6b55bb85136a6c0ebe4feb677534db74039
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 "frameworks_base: ES translations" into cm-10.2
frameworks_base: ES translations

- SystemUI: Restore AOSP strings
- Core: Added percent during low battery (same as default)

Change-Id: I0d0fb1a77a4033dbf0d7d5d174fb16e222826693
SystemUI: modify AOSP EL translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I405cd1d6cd8e77141d948510676cce48df5ee339
SystemUI: Add ethernet network icon

Add an ethernet network icon to the statusbar network area.

Change-Id: I019740f360b5f9cc85f404f75d38e38896182a81
Merge "SystemUI: Add ethernet network icon" into cm-10.2
SystemUI: Fix missing context var

Change-Id: I083f85fdfec2bde88e6d8e0366d94e86eaea20cd
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_base into cm-10.2