Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy