| commit | baa11a13922eaf8825741e80495a03d61217e2e9 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Mon Oct 03 16:49:50 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Mon Oct 03 16:49:50 2011 -0700 |
| tree | 5c2227210025f940ea55dcbcdacea98d236928fd | |
| parent | 48e199d1dfdef74018ee15171c4309ac7d1ed548 [diff] | |
| parent | 3468b5e5a03a16eb9627e029346b922153195657 [diff] |
merge in ics-factoryrom-release history after reset to ics-factoryrom
diff --git a/res/drawable-xhdpi/wallpaper_architecture.jpg b/res/drawable-xhdpi/wallpaper_architecture.jpg index c6ecb0d..7605f75 100644 --- a/res/drawable-xhdpi/wallpaper_architecture.jpg +++ b/res/drawable-xhdpi/wallpaper_architecture.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_architecture_small.jpg b/res/drawable-xhdpi/wallpaper_architecture_small.jpg index 8a258e5..f17d9e8 100644 --- a/res/drawable-xhdpi/wallpaper_architecture_small.jpg +++ b/res/drawable-xhdpi/wallpaper_architecture_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_bubblegum.jpg b/res/drawable-xhdpi/wallpaper_bubblegum.jpg index a68c1c0..d6c1329 100644 --- a/res/drawable-xhdpi/wallpaper_bubblegum.jpg +++ b/res/drawable-xhdpi/wallpaper_bubblegum.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg b/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg index a75c006..5875810 100644 --- a/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg +++ b/res/drawable-xhdpi/wallpaper_bubblegum_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_canyon_small.jpg b/res/drawable-xhdpi/wallpaper_canyon_small.jpg index a29b9b8..72513b4 100644 --- a/res/drawable-xhdpi/wallpaper_canyon_small.jpg +++ b/res/drawable-xhdpi/wallpaper_canyon_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_chroma.jpg b/res/drawable-xhdpi/wallpaper_chroma.jpg index e400338..6f8c85e 100644 --- a/res/drawable-xhdpi/wallpaper_chroma.jpg +++ b/res/drawable-xhdpi/wallpaper_chroma.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_chroma_small.jpg b/res/drawable-xhdpi/wallpaper_chroma_small.jpg index 7e8698c..781c2c7 100644 --- a/res/drawable-xhdpi/wallpaper_chroma_small.jpg +++ b/res/drawable-xhdpi/wallpaper_chroma_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_escape.jpg b/res/drawable-xhdpi/wallpaper_escape.jpg index 253ab5a..09c9866 100644 --- a/res/drawable-xhdpi/wallpaper_escape.jpg +++ b/res/drawable-xhdpi/wallpaper_escape.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_escape_small.jpg b/res/drawable-xhdpi/wallpaper_escape_small.jpg index b506076..3a1a9c1 100644 --- a/res/drawable-xhdpi/wallpaper_escape_small.jpg +++ b/res/drawable-xhdpi/wallpaper_escape_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_fiber.jpg b/res/drawable-xhdpi/wallpaper_fiber.jpg deleted file mode 100644 index 974a56c..0000000 --- a/res/drawable-xhdpi/wallpaper_fiber.jpg +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_fiber_small.jpg b/res/drawable-xhdpi/wallpaper_fiber_small.jpg deleted file mode 100644 index 2406cce..0000000 --- a/res/drawable-xhdpi/wallpaper_fiber_small.jpg +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_fidelity.jpg b/res/drawable-xhdpi/wallpaper_fidelity.jpg index dd3be55..38b15a5 100644 --- a/res/drawable-xhdpi/wallpaper_fidelity.jpg +++ b/res/drawable-xhdpi/wallpaper_fidelity.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_fidelity_small.jpg b/res/drawable-xhdpi/wallpaper_fidelity_small.jpg index 7cfd2f0..01092cc 100644 --- a/res/drawable-xhdpi/wallpaper_fidelity_small.jpg +++ b/res/drawable-xhdpi/wallpaper_fidelity_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_flora_small.jpg b/res/drawable-xhdpi/wallpaper_flora_small.jpg index 4564f4c..7faebc9 100644 --- a/res/drawable-xhdpi/wallpaper_flora_small.jpg +++ b/res/drawable-xhdpi/wallpaper_flora_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_kepler_small.jpg b/res/drawable-xhdpi/wallpaper_kepler_small.jpg index 9424fba..dad79a2 100644 --- a/res/drawable-xhdpi/wallpaper_kepler_small.jpg +++ b/res/drawable-xhdpi/wallpaper_kepler_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_leaf.jpg b/res/drawable-xhdpi/wallpaper_leaf.jpg index 9d77466..c8cc7fe 100644 --- a/res/drawable-xhdpi/wallpaper_leaf.jpg +++ b/res/drawable-xhdpi/wallpaper_leaf.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_leaf_small.jpg b/res/drawable-xhdpi/wallpaper_leaf_small.jpg index 00fe14a..f37aab9 100644 --- a/res/drawable-xhdpi/wallpaper_leaf_small.jpg +++ b/res/drawable-xhdpi/wallpaper_leaf_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_noir_small.jpg b/res/drawable-xhdpi/wallpaper_noir_small.jpg index 7b1076b..482a832 100644 --- a/res/drawable-xhdpi/wallpaper_noir_small.jpg +++ b/res/drawable-xhdpi/wallpaper_noir_small.jpg Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg b/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg index 2fc85f5..0b4cde7 100644 --- a/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg +++ b/res/drawable-xhdpi/wallpaper_outofthebox_small.jpg Binary files differ
diff --git a/res/values-xhdpi/wallpapers.xml b/res/values-xhdpi/wallpapers.xml index ad46acd..fb386f4 100644 --- a/res/values-xhdpi/wallpapers.xml +++ b/res/values-xhdpi/wallpapers.xml
@@ -22,7 +22,6 @@ <item>wallpaper_canyon</item> <item>wallpaper_chroma</item> <item>wallpaper_escape</item> - <item>wallpaper_fiber</item> <item>wallpaper_fidelity</item> <item>wallpaper_flora</item> <item>wallpaper_kepler</item>
