#适配android平板分辨率不规则问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW