fix conflicts
Merge branch 'cm-11.0' of https://github.com/Triangles/android_frameworks_base into cm-11.0