From 2775cb34b390ad52d0920bb533232571568c3f71 Mon Sep 17 00:00:00 2001
From: Cameron Neale <cdneale@google.com>
Date: Fri, 31 Oct 2014 13:18:38 -0700
Subject: Changes made to accomodate GSA in Google3 w/ Robolectric

dragViewOffset removed from WallpaperPicker as it was causing
a duplicate resource conflict with launcher3 and was not used
within the WallpaperPicker project.

Empty <application> tag added to WallpaperPicker manifest as required by
Robolectric

Removed <add-resource> tag from L3 manifest, unrecognized by Robolectric

Change-Id: I3744fc50731f82c3e6fdc01d9819e9a0302dc503
---
 WallpaperPicker/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WallpaperPicker/AndroidManifest.xml')

diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml
index 86a94d078..5b6a0077d 100644
--- a/WallpaperPicker/AndroidManifest.xml
+++ b/WallpaperPicker/AndroidManifest.xml
@@ -4,7 +4,7 @@
         android:versionCode="1"
         android:versionName="1.0"
         >
-
+  
     <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />
-
+    <application/>
 </manifest>
-- 
cgit v1.2.3