derp

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