Commit 4c80caf6 by 王文龙

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/offcn/im/demo/ui/SplashActivity.java
#	app/src/main/java/com/offcn/imclient/ui/ContactListFragment.java
#	app/src/main/java/com/offcn/imclient/ui/LoginActivity.java
#	app/src/main/res/values/strings.xml
parents 2edfc1db ed9472b7
++ "b/~$IMSDK\346\226\207\346\241\243_Android.doc"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment