Merge remote-tracking branch 'cm/cm-10.2' into wszf
Merge branch 'jb43' of github.com:Wosp/android_frameworks_base into wszf