Fix typo

Change-Id: I8d9b25a5cec9ec697cb46ab168ff2a1a7dc6da6f

Conflicts:

	dependencies/u8860.dependencies
track back zyonee mako kernel
u8815
Aries: XIAOMI
Aries: XIAOMI
Merge branch 'jellybean' of github.com:BAM-Team/android_vendor_BAM-Rom into jellybean
cleanup
Aries: increase dpi
u8860 update
Added deb
Merge pull request #5 from BAM-Team/jellybean

Maj