removed <<<<<<<head
Merge branch 'cm-10.1' of git://github.com/swiperrat/android_frameworks_base into cm-10.1