# Conflicts: # ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
