Merge branch 'cm-10.2' of github.com:Quarx2k/android_frameworks_base into cm-10.2
Merge branch 'cm-10.2' of github.com:pottkopp/android_frameworks_base into cm-10.2