History for CosmosClient / app / src / main / java / com / example / cosmosclient / views / SigninActivity.java

# Conflicts:
#	app/src/main/res/values/strings.xml
#	gradle/wrapper/gradle-wrapper.properties

マージによる漏れ分