# Conflicts: # ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/LockReportJSON.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
