fixes yeah
Merge branch 'master' of https://github.com/spacecaker/android_frameworks_base_CSM9.1_Kumquat