diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index 111c0c9d3d..f22fc091a8 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -2,7 +2,7 @@
 
 <!-- IMPORTANT: Do not manually manipulate this automatically generated file, changes will be gone after the next build! -->
 
-<manifest package="${ANDROID_APK_PACKAGE}" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+<manifest package="${ANDROID_APK_PACKAGE}" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="${ANDROID_APK_VERSION_NAME}" android:versionCode="${ANDROID_APK_VERSION_CODE}" android:installLocation="auto">
   <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/AppDisplayName" android:icon="@drawable/icon">
     
     <!-- VR MODE -->
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index f8108580a8..c62584916a 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -20,6 +20,8 @@ set(ANDROID_APP_DISPLAY_NAME Interface)
 set(ANDROID_API_LEVEL 19)
 set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
 set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceActivity)
+set(ANDROID_APK_VERSION_NAME "0.1")
+set(ANDROID_APK_VERSION_CODE 1)
 set(ANDROID_DEPLOY_QT_INSTALL "--install")
 
 find_package(LibOVR REQUIRED)
@@ -39,6 +41,16 @@ if (HOCKEY_APP_ID)
   set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceBetaActivity)
   set(ANDROID_DEPLOY_QT_INSTALL "")
   
+  # set the ANDROID_APK_VERSION_CODE to the number of git commits
+  execute_process(
+    COMMAND  git rev-list --first-parent --count HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_COMMIT_COUNT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  
+  set(ANDROID_APK_VERSION_CODE ${GIT_COMMIT_COUNT})
+  
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/InterfaceBetaActivity.java.in" "${ANDROID_APK_BUILD_DIR}/src/io/highfidelity/gvrinterface/InterfaceBetaActivity.java")
 else ()
   set(HOCKEY_APP_ENABLED false)