summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-11-12 23:21:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-12 23:21:42 -0800
commitc5975df1cb008a9cd22d53dbf7049abe1a0e8103 (patch)
tree8867b78d3a2762956155741dcca9d0f2299d62cd /res
parent40f7a658e366b40747ef7ceceb388498bb841ba0 (diff)
parent3753b4ae2a7818a6f43be5e0a5e3b3c448212b02 (diff)
downloadandroid_packages_apps_Trebuchet-c5975df1cb008a9cd22d53dbf7049abe1a0e8103.tar.gz
android_packages_apps_Trebuchet-c5975df1cb008a9cd22d53dbf7049abe1a0e8103.tar.bz2
android_packages_apps_Trebuchet-c5975df1cb008a9cd22d53dbf7049abe1a0e8103.zip
am 3753b4ae: am 37b91eb1: am 0faf71a1: Merge change Ieb9892d5 into eclair
Merge commit '3753b4ae2a7818a6f43be5e0a5e3b3c448212b02' * commit '3753b4ae2a7818a6f43be5e0a5e3b3c448212b02': Two wallpapers were missing from the list.
Diffstat (limited to 'res')
-rw-r--r--res/raw/maps.pngbin5374 -> 0 bytes
-rw-r--r--res/values-hdpi/wallpapers.xml3
2 files changed, 2 insertions, 1 deletions
diff --git a/res/raw/maps.png b/res/raw/maps.png
deleted file mode 100644
index fd5fc3903..000000000
--- a/res/raw/maps.png
+++ /dev/null
Binary files differ
diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml
index 45e0c31e9..37d542f5f 100644
--- a/res/values-hdpi/wallpapers.xml
+++ b/res/values-hdpi/wallpapers.xml
@@ -20,12 +20,13 @@
<item>wallpaper_nexusrain</item>
<item>wallpaper_darkgraylined</item>
<item>wallpaper_brown</item>
- <item>wallpaper_nooneexpectsthe</item>
+ <item>wallpaper_noexpectsthe</item>
<item>wallpaper_lavadark</item>
<item>wallpaper_greencorr</item>
<item>wallpaper_pcut</item>
<item>wallpaper_hazybluedots</item>
<item>wallpaper_purple</item>
+ <item>wallpaper_ropelights</item>
<item>wallpaper_electric</item>
<item>wallpaper_grass</item>
<item>wallpaper_monumentvalley</item>