CNLive Android Team / CNLiveApp · Commits

Conflicts:
	app/src/main/res/values/colors.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/styles.xml

Conflicts:
	app/build.gradle
	app/libs/libcnlivelive.jar
	app/libs/libcnliveutil.jar
	app/src/main/AndroidManifest.xml
	app/src/main/jniLibs/arm64-v8a/libRongIMLib.so
	app/src/main/jniLibs/arm64-v8a/libksylive.so
	app/src/main/jniLibs/armeabi-v7a/libRongIMLib.so
	app/src/main/jniLibs/armeabi-v7a/libksylive.so
	app/src/main/jniLibs/armeabi/libRongIMLib.so
	app/src/main/jniLibs/armeabi/libksylive.so
	app/src/main/jniLibs/x86/libRongIMLib.so
	app/src/main/jniLibs/x86/libksylive.so
	app/src/main/res/values/strings.xml

Conflicts:
	app/build.gradle
	app/libs/libcnlivelive.jar
	app/libs/libcnliveutil.jar
	app/src/main/AndroidManifest.xml
	app/src/main/jniLibs/arm64-v8a/libRongIMLib.so
	app/src/main/jniLibs/arm64-v8a/libksylive.so
	app/src/main/jniLibs/armeabi-v7a/libRongIMLib.so
	app/src/main/jniLibs/armeabi-v7a/libksylive.so
	app/src/main/jniLibs/armeabi/libRongIMLib.so
	app/src/main/jniLibs/armeabi/libksylive.so
	app/src/main/jniLibs/x86/libRongIMLib.so
	app/src/main/jniLibs/x86/libksylive.so
	app/src/main/res/values/strings.xml