Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

32 files changed, 0 insertions, 0 deletions

diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
index 2b46dbb9..2b46dbb9 100644
--- a/res/drawable-xxhdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
index e9a58eaf..e9a58eaf 100644
--- a/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
index 04000fd0..04000fd0 100644
--- a/res/drawable-xxhdpi/ic_action_chat.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_chat.png
diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png
index a0508df8..a0508df8 100644
--- a/res/drawable-xxhdpi/ic_action_copy.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_copy.png
diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
index cb1260a4..cb1260a4 100644
--- a/res/drawable-xxhdpi/ic_action_discard.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png
index 3a241ea4..3a241ea4 100644
--- a/res/drawable-xxhdpi/ic_action_edit.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit.png
diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
index f2b2078b..f2b2078b 100644
--- a/res/drawable-xxhdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png
index 9289b1c8..9289b1c8 100644
--- a/res/drawable-xxhdpi/ic_action_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_group.png
diff --git a/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png
index c42c2bfb..c42c2bfb 100644
--- a/res/drawable-xxhdpi/ic_action_new.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new.png
diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
index ce7536cb..ce7536cb 100644
--- a/res/drawable-xxhdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
index a186f1fb..a186f1fb 100644
--- a/res/drawable-xxhdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
diff --git a/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
index cb847f37..cb847f37 100644
--- a/res/drawable-xxhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
diff --git a/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png
index 331c545b..331c545b 100644
--- a/res/drawable-xxhdpi/ic_action_remove.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_remove.png
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
index a1086388..a1086388 100644
--- a/res/drawable-xxhdpi/ic_action_search.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_search.png
diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
index ccf1fb00..ccf1fb00 100644
--- a/res/drawable-xxhdpi/ic_action_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_secure.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
index 12ec4d33..12ec4d33 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
index 7719f81a..7719f81a 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
index 18895813..18895813 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
index 29bde36e..29bde36e 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
diff --git a/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png
index 0b642d9b..0b642d9b 100644
--- a/res/drawable-xxhdpi/ic_activity.png
+++ b/src/main/res/drawable-xxhdpi/ic_activity.png
diff --git a/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
index 2c51b8b7..2c51b8b7 100644
--- a/res/drawable-xxhdpi/ic_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_indicator.png
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index 65c1af34..65c1af34 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png
index ee1e9534..ee1e9534 100644
--- a/res/drawable-xxhdpi/ic_notification.png
+++ b/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/res/drawable-xxhdpi/ic_profile.png b/src/main/res/drawable-xxhdpi/ic_profile.png
index 309dc513..309dc513 100644
--- a/res/drawable-xxhdpi/ic_profile.png
+++ b/src/main/res/drawable-xxhdpi/ic_profile.png
diff --git a/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
index 039a9ef9..039a9ef9 100644
--- a/res/drawable-xxhdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
diff --git a/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
index 1ee9b67d..1ee9b67d 100644
--- a/res/drawable-xxhdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
diff --git a/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
index e4439e7c..e4439e7c 100644
--- a/res/drawable-xxhdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
index dd2ded89..dd2ded89 100644
--- a/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
index 58c8a576..58c8a576 100644
--- a/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
index 566062f0..566062f0 100644
--- a/res/drawable-xxhdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
index 432e68c4..432e68c4 100644
--- a/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
index 8dd01d5c..8dd01d5c 100644
--- a/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png