derps
Merge branch 'nlnp-jb-mr2' of git://github.com/NLNP-AOKP/platform_vendor_nlnp into nlnp-jb-mr2