Merge CM

CyanogenMod/android_frameworks_base@f73881b7aab23e81668bee341ee9c0e242ad1d16
CyanogenMod/android_frameworks_base@75a2ee594936d69b47e2fdba773bd5281c928cda
CyanogenMod/android_frameworks_base@10520e11c5f0aa28b21e082b1b904cec53e0027e
CyanogenMod/android_frameworks_base@b15ac2d706459e4164790370c4d6ff2f3cc0f41f
CyanogenMod/android_frameworks_base@ad99f081ffbaa78ec3c2787384752590e526be7d
CyanogenMod/android_frameworks_base@a5e145815df07d763c784d9d6e1d50373a8fafea
CyanogenMod/android_frameworks_base@3d07d4f92184f1afd470276e81fe5093a8c949b0
CyanogenMod/android_frameworks_base@e02a4ba6ae83f566c033bebebe9ba607e2d6c371
CyanogenMod/android_frameworks_base@b6ced928d02b6217f142e625078fa30d6e6b849c

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>
Fix mismerge
Merge pull request #9 from nolinuxnoparty/cm-11.0

Merge CM