summaryrefslogtreecommitdiffstats
path: root/res/mipmap-xhdpi
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-02-15 14:45:54 -0800
committerSteve Kondik <shade@chemlab.org>2013-02-15 14:45:54 -0800
commited1816e3a828046439da5cb31a65af4641be9076 (patch)
tree994e4ed51b3e1630e338b3ec255a8f4dce429953 /res/mipmap-xhdpi
parentc43d6eebe95dcabcb4ded1c4da8c6cc21d2514f5 (diff)
parent002c25eede2a33a5378c16c5bb9165179783e729 (diff)
downloadandroid_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.gz
android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.bz2
android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.zip
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into treb
Android 4.2.2 release 1 Conflicts: res/layout-land/launcher.xml res/layout-port/launcher.xml res/layout-sw720dp/launcher.xml src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java src/com/cyanogenmod/trebuchet/CellLayout.java src/com/cyanogenmod/trebuchet/Launcher.java src/com/cyanogenmod/trebuchet/PagedView.java Change-Id: I415138430337bcd21070b815a80de9c0cdd52239
Diffstat (limited to 'res/mipmap-xhdpi')
-rwxr-xr-xres/mipmap-xhdpi/ic_launcher_home.pngbin0 -> 39749 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_wallpaper.pngbin0 -> 6061 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
new file mode 100755
index 000000000..70ec47580
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..60f8dceec
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
Binary files differ