infected

Change-Id: I61af308ad8bbf96da39631c92c6a27052d48a9fd
Merge branch 'cm-10.2' of https://github.com/infectedmushi/android_vendor_cm into HEAD