reset
Merge branch 'helly' of https://github.com/thdDude/android_vendor_cm into helly