test5
Merge branch 'cm-11.0' of github.com:Dokdo-Project/android_frameworks_base into cm-11.0