commit 5caa45bbc1a0fa4d0eb2c696a0cda38e416d1530
author Walter Jang <wjang@google.com> Wed Mar 30 08:56:34 2016 -0700
committer Walter Jang <wjang@google.com> Wed Mar 30 08:56:34 2016 -0700
tree 8047858e0e929cd365aaac3d3ae734e45e3fdbd1
parent cef642dcaee08f68135f137c45e5a7ef0b4a8a0e
parent 82f4b931fa57a5a4d638461e40165c72db5bc102

resolve merge conflicts of 82f4b93 to master

Change-Id: I9cb01e915d6029ffd5f953beb61f76480a406c70

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7f712ad..2eb1b9d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10407"
-    android:versionName="1.4.7">
+    android:versionCode="10408"
+    android:versionName="1.4.8">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />
     <original-package android:name="com.android.contacts" />