# Conflicts: # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java # gradle.properties