ABVJE_Launcher_Android · 2ed6b474a5fab66b270f3194e51426ed06597fcf · abook_android / abook_check

Merge branch 'features/1.3.0_chat' into features/1.2.301_ogawa-y · 7218f80e

# 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

committed Jul 28, 2020

7218f80e

Name	Last commit	Last Update
..
.externalToolBuilders		Loading commit data...
assets		Loading commit data...
fcm		Loading commit data...
libs		Loading commit data...
res		Loading commit data...
src		Loading commit data...
.gitignore		Loading commit data...
ABVJE_Android_Release.keystore		Loading commit data...
AndroidManifest.xml		Loading commit data...
build.gradle		Loading commit data...
custom_rules.xml		Loading commit data...
proguard.cfg		Loading commit data...
project.properties		Loading commit data...