Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_native.git into cm-10.1
Merge remote-tracking branch 'albinoman887/cm-10.1' into cm-10.1