Merge pull request #1 from horn3t/jb2

Merge
Android Studio cleanups
Revert "Android Studio cleanups"

This reverts commit 6720eafc5332c9b5d54d79dedb0d7783d5110f12.
Merge branch 'jb2' of https://github.com/horn3t/android_packages_apps_PerformanceControl into horn3t-jb2
Improved German Translations

Change-Id: I05f5dc5fc2db41676966491743088f590cee2e58
Merge pull request #4 from Evisceration/cm-10.2

Improved German Translations