Hellybean

Change-Id: Ia30b8593d127103d7656ff0b49df05ff0920c01b
Merge branch 'cm-10.1' of github.com:DerTeufel/android_vendor_cm into cm-10.1

Conflicts:
	tools/squisher

Change-Id: I54b756ba6fd311e397f669edf3c0faf55a823a35