derp

Change-Id: Ic6d6f6bccf43887fce2d41d621da763598eb8cc4
Merge branch 'jb43' of git://github.com/ParanoidAndroid/android_vendor_pa into jb43