Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_amazon_omap4-common into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_amazon_omap4-common into cm-10.1
libtiutils: update from omapzoom for jb, and rename to avoid conflict

Change-Id: I99c43da8cf53b81ea81e6e1456a578a7940f672f
includes: add new camera related defines

Change-Id: I18f8c521a1019a6e43403b3329f7e1c3750f0222
camera: backport jb camera from omapzoom for ics ducati support

Change-Id: I2c61cf8ed254e151097a7221f7f245e412c05f4f
Merge "libtiutils: update from omapzoom for jb, and rename to avoid conflict" into cm-10.1
Merge "includes: add new camera related defines" into cm-10.1
Merge "camera: backport jb camera from omapzoom for ics ducati support" into cm-10.1
camera: bugfixes and cleanup

Change-Id: I71aaef350e3617b024ec036c146de34598d2b35f
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1-k34
Merge remote-tracking branch 'kf/cm-10.1' into cm-10.1-k34