Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp * commit '7756cbeef475127ed56bfeabecb3c291366a952f': Removed the device type checking
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp * commit '7756cbeef475127ed56bfeabecb3c291366a952f': Removed the device type checking