lets get this party started

Change-Id: I98ed3f30ef47181b02458b45be9402a8be151d5a
merge with cyanogenmod

Change-Id: I907edef3c100170c5b049e634379ec1c09bf7755