CNLive Android Team / CNLiveApp · Commits

# Conflicts:
#	app/src/main/res/values/styles.xml

# Conflicts:
#	app/src/main/res/values/colors.xml

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java