diff options
| author | Cameron Neale <cdneale@google.com> | 2014-10-31 13:18:38 -0700 |
|---|---|---|
| committer | Cameron Neale <cdneale@google.com> | 2014-10-31 14:06:07 -0700 |
| commit | 2775cb34b390ad52d0920bb533232571568c3f71 (patch) | |
| tree | 4e01bc805cafb3008c6fd32dc2febfc509e1a77c /WallpaperPicker/AndroidManifest.xml | |
| parent | 955f14c45191fc5a44997e84a2ba8d9ee7f925c5 (diff) | |
| download | android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.gz android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.bz2 android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.zip | |
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
Diffstat (limited to 'WallpaperPicker/AndroidManifest.xml')
| -rw-r--r-- | WallpaperPicker/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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> |