Merge branch 'jb' of http://github.com/IllusionProject/android_frameworks_base into jellybean