commit 2775cb34b390ad52d0920bb533232571568c3f71
author Cameron Neale <cdneale@google.com> Fri Oct 31 13:18:38 2014 -0700
committer Cameron Neale <cdneale@google.com> Fri Oct 31 14:06:07 2014 -0700
tree 4e01bc805cafb3008c6fd32dc2febfc509e1a77c
parent 955f14c45191fc5a44997e84a2ba8d9ee7f925c5

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

diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml
index 86a94d0..5b6a007 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>