I am an idiot

Signed-off-by: Grarak <williye97@gmail.com>
Merge branch 'cm-10.2' of github.com:Grarak/android_device_samsung_melius-common into cm-10.2