From 6a6d81ccef2aa7da0ff36243d78da730bfd4c64b Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 26 Jul 2016 22:12:34 -0400
Subject: [PATCH] update android version

---
 android/AndroidManifest.xml     | 2 +-
 tools/update_android_version.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index d8b768623..4afe95caa 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.9.7b-362-g303a70c" android:versionCode="2888" android:installLocation="auto">
+<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.0.0" android:versionCode="2970" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qgroundcontrol.qgchelper.UsbDeviceJNI" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="sensorLandscape" android:launchMode="singleTask" android:keepScreenOn="true">
             <intent-filter>
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 73e7ef20e..4734957f1 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 
-# this requires `master` in the git tree
-#  travis-ci branch builds are unable to set the version properly
+# this requires `origin/master` in the git tree
 
 MANIFEST_FILE=android/AndroidManifest.xml
 
-VERSIONCODE=`git rev-list master --first-parent --count`
+VERSIONCODE=`git rev-list origin/master --first-parent --count`
 VERSIONNAME=`git describe --always --tags | sed -e 's/^v//'`
 
 if [ -n "$VERSIONCODE" ]; then
-- 
2.22.0