[Android] On the road to 1.2.0

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 14 17:15:26 2015 +0100| [63a22efc9556f908945bc23538d73730adf0e21f] | committer: Jean-Baptiste Kempf

On the road to 1.2.0

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

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

diff --git a/NEWS b/NEWS
index b4cb68e..df976bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Changes between 1.1.5 and 1.2.0-git:
+--------------------------------
+
 Changes between 1.1.4 and 1.1.5:
 --------------------------------
 
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 0c37baf..f9ca5dc 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="01010500"
-    android:versionName="1.1.5" >
+    android:versionCode="01020000"
+    android:versionName="1.2.0-git" >
     <!--
          versionCode scheme is T M NN RR AA
          T: Target/Flavour (0 for Android, 1 for ATV, 2 for Chrome?)