修改报警信息中，报警信息为空的情况
Merge remote-tracking branch 'origin/master'

Conflicts:
	projects/HDview/src/com/starnet/snview/alarmmanager/AlarmActivity.java
	projects/HDview/src/com/starnet/snview/alarmmanager/AlarmDeviceAdapter.java