pre merge for status
Merge remote-tracking branch 'origin/iss299' into android-chat-only
Merge remote-tracking branch 'origin/iss299' into android-chat-only
pre merge for status2
Merge remote-tracking branch 'origin/iss299' into android-chat-only
pre merge for status3