# Conflicts: # ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
