# Conflicts: # ABVJE_Launcher_Android/AndroidManifest.xml # ABVJE_Res_Default_Android/res/values-ja/strings.xml # ABVJE_Res_Default_Android/res/values-ko/strings.xml # ABVJE_Res_Default_Android/res/values/strings.xml # ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/OnAppDownloadReceiver.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
