Merge commit 'refs/changes/49/50449/7' of http://review.cyanogenmod.org/CyanogenMod/android_frameworks_base into HEAD