# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/App.java

# Conflicts:
#	app/src/main/res/layout/dialog_prompt.xml

添加so库;