Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_native into jb-mv
Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_frameworks_native into cm-10.1