Merge branch 'cm-10.2' of https://github.com/sembre/android_frameworks_native into cm-10.2
test add
Merge branch 'cm-10.2' of https://github.com/sembre/android_frameworks_native into cm-10.2