diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-01 18:14:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-01 18:14:28 -0700 |
commit | b8968f2ce791c437322c25ef6e6fdc9d0fa10d65 (patch) | |
tree | d85bd440d970d118acf2b69e667c726ccb0f1b9b | |
parent | 607bb9a208578dc7e0aa79c4dd222e3edd26566b (diff) | |
parent | 706c985f0a8c8d996b979543a541ed2cb41269e1 (diff) | |
download | android_packages_apps_Snap-b8968f2ce791c437322c25ef6e6fdc9d0fa10d65.tar.gz android_packages_apps_Snap-b8968f2ce791c437322c25ef6e6fdc9d0fa10d65.tar.bz2 android_packages_apps_Snap-b8968f2ce791c437322c25ef6e6fdc9d0fa10d65.zip |
am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
* commit '706c985f0a8c8d996b979543a541ed2cb41269e1':
Deactivate the backup agent in Camera2
-rw-r--r-- | AndroidManifest.xml | 1 |
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" |