Merge remote-tracking branch 'origin/master' into contacts

Authored by sredman on Mar 25 2018, 5:15 PM.

Description

Merge remote-tracking branch 'origin/master' into contacts

Merged Changes

CommitAuthorDetailsCommitted
00b6677aa406D11679mtijink
When receiving a file Android, show the image in the notification 
Mar 25 2018