derp
Merge branch 'lp5.0' of https://github.com/OwnROM/android into lp5.0