ABVJE_Res_Default_Android/res · 97762cd8e6fb183c49215c3bed518091f2eefbcd · abook_android / abook_check

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

committed Feb 17, 2020

970a3eb2

Name	Last commit	Last Update
..
drawable		Loading commit data...
drawable-hdpi		Loading commit data...
drawable-land-xhdpi		Loading commit data...
drawable-mdpi		Loading commit data...
drawable-port-xhdpi		Loading commit data...
drawable-xhdpi		Loading commit data...
drawable-xxhdpi		Loading commit data...
raw		Loading commit data...
raw-ja		Loading commit data...
values		Loading commit data...
values-ja		Loading commit data...
values-ko		Loading commit data...
values-large		Loading commit data...
values-normal		Loading commit data...
values-xlarge		Loading commit data...