Aries: XIAOMI
Merge branch 'jellybean' of github.com:BAM-Team/android_vendor_BAM-Rom into jellybean