[Android] Prepare 1.1.6

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 17 14:05:12 2015 +0100| [f0338c3a4287011403dc35fe9ad812e0e990dfb7] | committer: Jean-Baptiste Kempf

Prepare 1.1.6

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=f0338c3a4287011403dc35fe9ad812e0e990dfb7
---

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

diff --git a/NEWS b/NEWS
index df976bd..0224aa4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,20 @@
-Changes between 1.1.5 and 1.2.0-git:
+Changes between 1.1.5 and 1.1.6:
 --------------------------------
 
+Application:
+ * Fix look of secondary fragments activities, for better navigation
+ * Rework actions
+ * Fix rare crashes
+ * Fix HDMI unplugging
+ * Improve seek
+
+TV:
+ * Recommend last video viewed
+
+Core:
+ * Fix mediacodec crash
+
+
 Changes between 1.1.4 and 1.1.5:
 --------------------------------
 
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 5b060c4..20f2499 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.videolan.vlc"
     android:installLocation="auto"
-    android:versionCode="01020000"
-    android:versionName="1.2.0-git" >
+    android:versionCode="01010600"
+    android:versionName="1.1.6" >
     <!--
          versionCode scheme is T M NN RR AA
          T: Target/Flavour (0 for Android, 1 for ATV, 2 for Chrome?)