resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

[android-x86/packages-apps-Launcher3.git] / WallpaperPicker / res / values / config.xml

diff --git a/WallpaperPicker/res/values/config.xml b/WallpaperPicker/res/values/config.xml
index 71580b5..2f5174c 100644 (file)
--- a/WallpaperPicker/res/values/config.xml
+++ b/WallpaperPicker/res/values/config.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <bool name="allow_rotation">false</bool>
     <!-- Specifies whether to expand the cropped area on both sides (rather
          than just to one side) -->
     <bool name="center_crop">false</bool>