strings.xml
129 KB
-
Merge branch 'contract/sato/1.0.101' into contract/sato/1.0.200 · 970a3eb2
# Conflicts: # ABVJE_Res_Default_Android/res/values-ja/strings.xml # ABVJE_Res_Default_Android/res/values-ko/strings.xml # ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BleManagerUtil.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java # ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/BlePairingSettingActivity.java
Lee Jaebin committed