diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
| commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
| tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /WallpaperPicker/res/values-sw600dp/config.xml | |
| parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip | |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'WallpaperPicker/res/values-sw600dp/config.xml')
| -rw-r--r-- | WallpaperPicker/res/values-sw600dp/config.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/WallpaperPicker/res/values-sw600dp/config.xml b/WallpaperPicker/res/values-sw600dp/config.xml deleted file mode 100644 index 62342dcc2..000000000 --- a/WallpaperPicker/res/values-sw600dp/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<resources> - <bool name="allow_rotation">true</bool> -</resources> |