diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
| commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
| tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/values-sw720dp/wallpapers.xml | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
| download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip | |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/values-sw720dp/wallpapers.xml')
| -rw-r--r-- | res/values-sw720dp/wallpapers.xml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/res/values-sw720dp/wallpapers.xml b/res/values-sw720dp/wallpapers.xml new file mode 100644 index 000000000..fb386f491 --- /dev/null +++ b/res/values-sw720dp/wallpapers.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (C) 2009 Google Inc. + * + * 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> + <string-array name="wallpapers" translatable="false"> + <item>wallpaper_architecture</item> + <item>wallpaper_bubblegum</item> + <item>wallpaper_canyon</item> + <item>wallpaper_chroma</item> + <item>wallpaper_escape</item> + <item>wallpaper_fidelity</item> + <item>wallpaper_flora</item> + <item>wallpaper_kepler</item> + <item>wallpaper_leaf</item> + <item>wallpaper_noir</item> + <item>wallpaper_outofthebox</item> + </string-array> +</resources> |