element-x-android

2f9bcde9 - Merge branch 'develop' into kaylendog/history-sharing/alert