Merge branch 'temp' into cm-10.2
Merge branch 'cm-10.2' of git://github.com/cm-mirror/cm_frameworks_base into cm-10.2