[Android] Release 2.0.5

[Jean-Baptiste Kempf]

vlc-android | branch: 2.0.x | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 22 15:43:04 2016 +0200| [81b61a75abe9a27a59adcfbe3004377a0155f7e5] | committer: Jean-Baptiste Kempf

Release 2.0.5

> https://code.videolan.org/videolan/vlc-android/commit/81b61a75abe9a27a59adcfbe3004377a0155f7e5
---

 NEWS                            | 15 +++++++++++++++
 vlc-android/AndroidManifest.xml |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index c8f8ed3..46cd68e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Changes between 2.0.4 and 2.0.5:
+--------------------------------
+
+Build:
+ * Fix build crashing on some Qualcomm ARMv8 devices
+
+Core:
+ * Fix MKV regression
+ * Fix HTTPS behaviour
+ * Support HTTP Proxy
+
+Application:
+ * Fix grouping settings
+
+
 Changes between 2.0.3 and 2.0.4:
 --------------------------------
 
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index ac6685f..a3b4997 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.videolan.vlc"
     android:installLocation="auto"
-    android:versionCode="02000400"
-    android:versionName="2.0.4">
+    android:versionCode="02000500"
+    android:versionName="2.0.5">
     <!--
          versionCode scheme is T M NN RR AA
          T: Target/Flavour (1 for Android, 2 for Chrome?)