summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-10-02 01:11:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-02 01:11:42 +0000
commit706c985f0a8c8d996b979543a541ed2cb41269e1 (patch)
tree4a41c9238208db40af7c60fdbf9d041da726cd8e
parent72a83bc295dfa5c0d07102065f50930bf18e28e2 (diff)
parente129ec0885fe366aa0cc6774e316b3c5e113a4fa (diff)
downloadandroid_packages_apps_Snap-706c985f0a8c8d996b979543a541ed2cb41269e1.tar.gz
android_packages_apps_Snap-706c985f0a8c8d996b979543a541ed2cb41269e1.tar.bz2
android_packages_apps_Snap-706c985f0a8c8d996b979543a541ed2cb41269e1.zip
Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
-rw-r--r--AndroidManifest.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d389b3c39..757c8b3e0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,7 +34,6 @@
<application
android:name="com.android.camera.app.CameraApp"
- android:backupAgent="com.android.camera.CameraBackupAgent"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/app_name"