Merged commit from device_motorola_jordan (refresh 2)

Check Org CyanogenDefy on github

Change-Id: I341b517b0e8c225927f46a8ffcad3bf44807d2a2
4 files changed